Author: wyoung
Date: Mon Jun 26 21:12:18 2006
New Revision: 1299
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1299&view=rev
Log:
Simplified some string concatenation code to make it work with STLport.
Patch by <[EMAIL PROTECTED]>.
Modified:
trunk/lib/manip.cpp
Modified: trunk/lib/manip.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/manip.cpp?rev=1299&r1=1298&r2=1299&view=diff
==============================================================================
--- trunk/lib/manip.cpp (original)
+++ trunk/lib/manip.cpp Mon Jun 26 21:12:18 2006
@@ -56,16 +56,17 @@
SQLQueryParms& operator <<(quote_type2 p, SQLString& in)
{
if (in.is_string) {
+ SQLString in2;
if (in.dont_escape) {
- SQLString in2 = '\'' + in + '\'';
- in2.processed = true;
- return *p.qparms << in2;
+ in2 = '\'' + in + '\'';
+ in2.processed = true;
+ return *p.qparms << in2;
}
else {
char* s = new char[in.size() * 2 + 1];
mysql_escape_string(s, in.c_str(),
static_cast<unsigned long>(in.size()));
- SQLString in2 = SQLString('\'') + s + '\'';
+ in2 = SQLString('\'') + s + '\'';
in2.processed = true;
*p.qparms << in2;
delete[] s;
@@ -305,7 +306,8 @@
SQLQueryParms& operator <<(quote_only_type2 p, SQLString& in)
{
if (in.is_string) {
- SQLString in2 = '\'' + in + '\'';
+ SQLString in2;
+ in2 = '\'' + in + '\'';
in2.processed = true;
return *p.qparms << in2;
}
@@ -363,7 +365,8 @@
SQLQueryParms& operator <<(quote_double_only_type2 p, SQLString& in)
{
if (in.is_string) {
- SQLString in2 = "\"" + in + "\"";
+ SQLString in2;
+ in2 = "\"" + in + "\"";
in2.processed = true;
return *p.qparms << in2;
}
@@ -419,7 +422,7 @@
char* s = new char[in.size() * 2 + 1];
mysql_escape_string(s, in.c_str(),
static_cast<unsigned long>(in.size()));
- SQLString in2 = s;
+ SQLString in2(s);
in2.processed = true;
*p.qparms << in2;
delete[] s;
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
