Author: mysqlpp
Date: Wed Dec 23 14:01:59 2009
New Revision: 2596

URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2596&view=rev
Log:
g++ 4 pedantic warning squishers

Modified:
    trunk/lib/query.cpp
    trunk/ssx/genv2.cpp
    trunk/test/uds.cpp

Modified: trunk/lib/query.cpp
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/query.cpp?rev=2596&r1=2595&r2=2596&view=diff
==============================================================================
--- trunk/lib/query.cpp (original)
+++ trunk/lib/query.cpp Wed Dec 23 14:01:59 2009
@@ -542,7 +542,8 @@
                // DELETE, CREATE, ALTER...) we need to figure out which case
                // this is.  (You might use store() instead of execute() for
                // such queries when the query strings come from "outside".)
-               if (copacetic_ = (conn_->errnum() == 0)) {
+               copacetic_ = (conn_->errnum() == 0);
+               if (copacetic_) {
                        if (parse_elems_.size() == 0) {
                                // Not a template query, so auto-reset
                                reset();
@@ -675,7 +676,8 @@
        else {
                // See comments in store() above for why we distinguish between
                // empty result sets and actual error returns here.
-               if (copacetic_ = (conn_->errnum() == 0)) {
+               copacetic_ = (conn_->errnum() == 0);
+               if (copacetic_) {
                        if (parse_elems_.size() == 0) {
                                // Not a template query, so auto-reset
                                reset();

Modified: trunk/ssx/genv2.cpp
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/ssx/genv2.cpp?rev=2596&r1=2595&r2=2596&view=diff
==============================================================================
--- trunk/ssx/genv2.cpp (original)
+++ trunk/ssx/genv2.cpp Wed Dec 23 14:01:59 2009
@@ -43,7 +43,7 @@
 // the parse result only if we were given sane parameters.
 
 static bool
-generate_ssqls2(ofstream& ofs, const ParseV2* pparse)
+generate_ssqls2(ofstream&, const ParseV2* pparse)
 {
        for (ParseV2::LineListIt it = pparse->begin(); 
                        it != pparse->end(); ++it) {

Modified: trunk/test/uds.cpp
URL: 
http://svn.gna.org/viewcvs/mysqlpp/trunk/test/uds.cpp?rev=2596&r1=2595&r2=2596&view=diff
==============================================================================
--- trunk/test/uds.cpp (original)
+++ trunk/test/uds.cpp Wed Dec 23 14:01:59 2009
@@ -42,6 +42,7 @@
 #endif
 
 #include <errno.h>
+#include <string.h>
 
 static const char* success_path = "test_uds_success.sock";
 static const char* failure_path = "test_uds_failure.sock";


_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits

Reply via email to