Author: wyoung
Date: Mon Jul 2 20:24:36 2007
New Revision: 1640
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1640&view=rev
Log:
The quote manipulator now works for char[] correctly. (It's always
worked for char*, but C++ doesn't consider those to be the same type.)
Modified:
trunk/lib/manip.cpp
trunk/lib/manip.h
Modified: trunk/lib/manip.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/manip.cpp?rev=1640&r1=1639&r2=1640&view=diff
==============================================================================
--- trunk/lib/manip.cpp (original)
+++ trunk/lib/manip.cpp Mon Jul 2 20:24:36 2007
@@ -105,6 +105,7 @@
template <>
ostream& operator <<(quote_type1 o, const char* const& in)
{
+ std::cout << "CRUMB 4" << std::endl;
size_t size = strlen(in);
char* s = new char[size * 2 + 1];
mysql_escape_string(s, in, static_cast<unsigned long>(size));
Modified: trunk/lib/manip.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/manip.h?rev=1640&r1=1639&r2=1640&view=diff
==============================================================================
--- trunk/lib/manip.h (original)
+++ trunk/lib/manip.h Mon Jul 2 20:24:36 2007
@@ -170,6 +170,18 @@
return operator <<(o, const_cast<const char* const&>(in));
}
+inline std::ostream& operator <<(quote_type1 o,
+ char in[])
+{
+ return operator <<(o, static_cast<const char* const&>(in));
+}
+
+inline std::ostream& operator <<(quote_type1 o,
+ const char in[])
+{
+ return operator <<(o, const_cast<char* const&>(in));
+}
+
template <>
inline std::ostream& operator <<(quote_type1 o,
@@ -540,6 +552,18 @@
return operator <<(o, const_cast<const char* const&>(in));
}
+inline std::ostream& operator <<(escape_type1 o,
+ char in[])
+{
+ return operator <<(o, static_cast<const char* const&>(in));
+}
+
+inline std::ostream& operator <<(escape_type1 o,
+ const char in[])
+{
+ return operator <<(o, const_cast<char* const&>(in));
+}
+
/// \enum do_nothing_type0
/// \anchor do_nothing_manip
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
