[patch] A tentative patch for C++11's std::shared_ptr compliance

pficommon-1.3.1.0-cpp11.patch (text/plain), 1.78 KB, created by OKUMURA N. Shin-ya on 2017-12-17 03:27:46 UTC

--- a/src/database/mysql/statement.cpp	2011-10-26 15:20:56.000000000 +0900
+++ b/src/database/mysql/statement.cpp	2017-12-16 23:22:00.936804292 +0900
@@ -48,7 +48,7 @@
 namespace database{
 namespace mysql{
 
-mysql_statement::mysql_statement(shared_ptr<mysql_connection_impl,
+mysql_statement::mysql_statement(pfi::lang::shared_ptr<mysql_connection_impl,
                                    pfi::concurrent::threading_model::multi_thread> &conn,
 				 const string &query)
   :conn(conn),meta(NULL)
@@ -98,7 +98,7 @@
   mysql_stmt_close(stmt);
 }
 
-int mysql_statement::execute(const vector<shared_ptr<sql_value> > &args)
+int mysql_statement::execute(const vector<pfi::lang::shared_ptr<sql_value> > &args)
 {
   if (param_count!=args.size()){
     ostringstream msg;
@@ -146,7 +146,7 @@
   return 0;
 }
 
-bool mysql_statement::fetch_row(vector<shared_ptr<sql_value> > &row)
+bool mysql_statement::fetch_row(vector<pfi::lang::shared_ptr<sql_value> > &row)
 {
   static const size_t INIT_BUF_SIZE = 16*1024;
   
--- a/src/database/mysql/connection.cpp	2011-10-26 15:20:56.000000000 +0900
+++ b/src/database/mysql/connection.cpp	2017-12-17 04:47:18.427708054 +0900
@@ -145,20 +145,20 @@
 }
 
 int mysql_connection::run(const string &sql,
-			  const vector<shared_ptr<sql_value> > &args)
+			  const vector<pfi::lang::shared_ptr<sql_value> > &args)
 {
   if (conn->get() == NULL) reconnect();
 
   // TODO: optimize
   try {
-    shared_ptr<statement> stat(prepare(sql));
+    pfi::lang::shared_ptr<statement> stat(prepare(sql));
     return stat->execute(args);
   }
   catch (const connection_error &e) {
     reconnect(); // this function rethrows an exception if necessary
   }
 
-  shared_ptr<statement> stat(prepare(sql));
+  pfi::lang::shared_ptr<statement> stat(prepare(sql));
   return stat->execute(args);
 }