namespace PT renamed to pt
This commit is contained in:
@@ -187,7 +187,7 @@ const std::wstring & DbBase::AssertValueWide(PGresult * r, int row, int col)
|
||||
const char * res = AssertValue(r, row, col);
|
||||
static std::wstring temp_wide_value; // !! IMPROVE ME add as a class field (nonstatic)
|
||||
|
||||
PT::UTF8ToWide(res, temp_wide_value);
|
||||
pt::UTF8ToWide(res, temp_wide_value);
|
||||
|
||||
return temp_wide_value;
|
||||
}
|
||||
@@ -211,7 +211,7 @@ void DbBase::AssertValueBin(PGresult * r, int row, int col, std::string & result
|
||||
void DbBase::AssertValueWide(PGresult * r, int row, int col, std::wstring & result)
|
||||
{
|
||||
const char * res = AssertValue(r, row, col);
|
||||
PT::UTF8ToWide(res, result);
|
||||
pt::UTF8ToWide(res, result);
|
||||
}
|
||||
|
||||
|
||||
@@ -247,28 +247,28 @@ unsigned int DbBase::AssertValueUInt(PGresult * r, int row, int col)
|
||||
|
||||
|
||||
|
||||
PT::Date DbBase::AssertValueDate(PGresult * r, int row, int col)
|
||||
pt::Date DbBase::AssertValueDate(PGresult * r, int row, int col)
|
||||
{
|
||||
PT::Date date = AssertValue(r, row, col);
|
||||
pt::Date date = AssertValue(r, row, col);
|
||||
|
||||
return date;
|
||||
}
|
||||
|
||||
|
||||
bool DbBase::AssertValueSpace(PGresult * r, int row, int col, PT::Space & space)
|
||||
bool DbBase::AssertValueSpace(PGresult * r, int row, int col, pt::Space & space)
|
||||
{
|
||||
const char * res = AssertValue(r, row, col);
|
||||
|
||||
conf_parser.SetSpace(space);
|
||||
space.clear();
|
||||
|
||||
PT::SpaceParser::Status status = conf_parser.ParseSpace(res);
|
||||
pt::SpaceParser::Status status = conf_parser.ParseSpace(res);
|
||||
|
||||
if( status != PT::SpaceParser::ok )
|
||||
if( status != pt::SpaceParser::ok )
|
||||
{
|
||||
log << log1 << "Db: a problem with parsing a PT::Space";
|
||||
|
||||
if( status == PT::SpaceParser::syntax_error )
|
||||
if( status == pt::SpaceParser::syntax_error )
|
||||
log << ", syntax error at line: " << conf_parser.get_last_parsed_line();
|
||||
|
||||
log << logend;
|
||||
|
||||
@@ -80,9 +80,9 @@ public:
|
||||
bool AssertValueBool(PGresult * r, int row, int col);
|
||||
unsigned long AssertValueULong(PGresult * r, int row, int col);
|
||||
unsigned int AssertValueUInt(PGresult * r, int row, int col);
|
||||
PT::Date AssertValueDate(PGresult * r, int row, int col);
|
||||
pt::Date AssertValueDate(PGresult * r, int row, int col);
|
||||
|
||||
bool AssertValueSpace(PGresult * r, int row, int col, PT::Space & space);
|
||||
bool AssertValueSpace(PGresult * r, int row, int col, pt::Space & space);
|
||||
|
||||
void ClearResult(PGresult * r);
|
||||
long AssertCurrval(const char * table);
|
||||
@@ -129,7 +129,7 @@ private:
|
||||
char UnescapeBinHexToDigit(char hex);
|
||||
|
||||
DbTextStream bquery;
|
||||
PT::SpaceParser conf_parser;
|
||||
pt::SpaceParser conf_parser;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -225,11 +225,11 @@ return *this;
|
||||
|
||||
|
||||
|
||||
DbTextStream & DbTextStream::operator<<(RawText<PT::Date> date)
|
||||
DbTextStream & DbTextStream::operator<<(RawText<pt::Date> date)
|
||||
{
|
||||
tmp_stream.Clear();
|
||||
date.par.Serialize(tmp_stream);
|
||||
PT::WideToUTF8(tmp_stream.CStr(), buffer, false);
|
||||
pt::WideToUTF8(tmp_stream.CStr(), buffer, false);
|
||||
tmp_stream.Clear();
|
||||
|
||||
was_param = false;
|
||||
@@ -290,7 +290,7 @@ DbTextStream & DbTextStream::ETextPutChar(wchar_t c)
|
||||
buffer += "\\\'"; // don't use "''" because we use the method for PQconnectdb too
|
||||
else
|
||||
if( c != 0 )
|
||||
PT::IntToUTF8(int(c), buffer, false);
|
||||
pt::IntToUTF8(int(c), buffer, false);
|
||||
|
||||
return *this;
|
||||
}
|
||||
@@ -584,7 +584,7 @@ return *this;
|
||||
|
||||
|
||||
|
||||
DbTextStream & DbTextStream::operator<<(const PT::Space & space)
|
||||
DbTextStream & DbTextStream::operator<<(const pt::Space & space)
|
||||
{
|
||||
tmp_stream.Clear();
|
||||
// !! IMPROVE ME
|
||||
@@ -597,7 +597,7 @@ return *this;
|
||||
}
|
||||
|
||||
|
||||
DbTextStream & DbTextStream::operator<<(const PT::Date & date)
|
||||
DbTextStream & DbTextStream::operator<<(const pt::Date & date)
|
||||
{
|
||||
tmp_stream.Clear();
|
||||
date.Serialize(tmp_stream);
|
||||
|
||||
@@ -143,10 +143,10 @@ public:
|
||||
DbTextStream & operator<<(RawText<unsigned long> raw);
|
||||
DbTextStream & operator<<(RawText<double> raw);
|
||||
DbTextStream & operator<<(RawText<void*> raw);
|
||||
DbTextStream & operator<<(RawText<PT::Date> date);
|
||||
DbTextStream & operator<<(RawText<pt::Date> date);
|
||||
|
||||
template<typename arg_char_type, size_t arg_stack_size, size_t arg_heap_block_size>
|
||||
DbTextStream & operator<<(RawText<PT::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> > raw);
|
||||
DbTextStream & operator<<(RawText<pt::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> > raw);
|
||||
|
||||
/*
|
||||
with escaping
|
||||
@@ -183,11 +183,11 @@ public:
|
||||
DbTextStream & operator<<(double);
|
||||
DbTextStream & operator<<(const void *);
|
||||
DbTextStream & operator<<(const std::vector<long> & tabid);
|
||||
DbTextStream & operator<<(const PT::Space & space);
|
||||
DbTextStream & operator<<(const PT::Date & date);
|
||||
DbTextStream & operator<<(const pt::Space & space);
|
||||
DbTextStream & operator<<(const pt::Date & date);
|
||||
|
||||
template<typename arg_char_type, size_t arg_stack_size, size_t arg_heap_block_size>
|
||||
DbTextStream & operator<<(const PT::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> & arg);
|
||||
DbTextStream & operator<<(const pt::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> & arg);
|
||||
|
||||
private:
|
||||
|
||||
@@ -202,7 +202,7 @@ private:
|
||||
|
||||
|
||||
template<typename arg_char_type, size_t arg_stack_size, size_t arg_heap_block_size>
|
||||
DbTextStream & DbTextStream::operator<<(RawText<PT::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> > raw)
|
||||
DbTextStream & DbTextStream::operator<<(RawText<pt::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> > raw)
|
||||
{
|
||||
TextStream<std::string>::operator<<(raw.par);
|
||||
|
||||
@@ -212,9 +212,9 @@ return *this;
|
||||
|
||||
|
||||
template<typename arg_char_type, size_t arg_stack_size, size_t arg_heap_block_size>
|
||||
DbTextStream & DbTextStream::operator<<(const PT::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> & arg)
|
||||
DbTextStream & DbTextStream::operator<<(const pt::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> & arg)
|
||||
{
|
||||
typename PT::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size>::const_iterator i;
|
||||
typename pt::TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size>::const_iterator i;
|
||||
|
||||
if( was_param )
|
||||
buffer += ", ";
|
||||
|
||||
Reference in New Issue
Block a user