now winix is using 'pikotools' (confparser, utf8, mainparser)
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@792 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
#include "core/log.h"
|
||||
#include "core/error.h"
|
||||
#include "core/misc.h"
|
||||
#include "utf8.h"
|
||||
#include "utf8/utf8.h"
|
||||
|
||||
|
||||
|
||||
@@ -145,7 +145,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; // !! dac jako skladowa klasy (niestatyczna)
|
||||
|
||||
Ezc::UTF8ToWide(res, temp_wide_value);
|
||||
PT::UTF8ToWide(res, temp_wide_value);
|
||||
|
||||
return temp_wide_value;
|
||||
}
|
||||
@@ -169,7 +169,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);
|
||||
Ezc::UTF8ToWide(res, result);
|
||||
PT::UTF8ToWide(res, result);
|
||||
}
|
||||
|
||||
|
||||
@@ -210,7 +210,7 @@ tm DbBase::AssertValueTm(PGresult * r, int row, int col)
|
||||
}
|
||||
|
||||
|
||||
bool DbBase::AssertValueSpace(PGresult * r, int row, int col, Space & space, bool split_single)
|
||||
bool DbBase::AssertValueSpace(PGresult * r, int row, int col, PT::Space & space, bool split_single)
|
||||
{
|
||||
const char * res = AssertValue(r, row, col);
|
||||
|
||||
@@ -219,13 +219,13 @@ bool DbBase::AssertValueSpace(PGresult * r, int row, int col, Space & space, boo
|
||||
conf_parser.SetSpace(space);
|
||||
space.Clear();
|
||||
|
||||
ConfParser::Status status = conf_parser.ParseString(res);
|
||||
PT::ConfParser::Status status = conf_parser.ParseString(res);
|
||||
|
||||
if( status != ConfParser::ok )
|
||||
if( status != PT::ConfParser::ok )
|
||||
{
|
||||
log << log1 << "Db: a problem with parsing a Space";
|
||||
log << log1 << "Db: a problem with parsing a PT::Space";
|
||||
|
||||
if( status == ConfParser::syntax_error )
|
||||
if( status == PT::ConfParser::syntax_error )
|
||||
log << ", syntax error at line: " << conf_parser.line;
|
||||
|
||||
log << logend;
|
||||
|
Reference in New Issue
Block a user