Get rid of C++11 deprecation warnings for auto_ptr, exception specs

In particular, std::auto_ptr is no longer mapped in C++11.

1 files changed, 14 insertions, 14 deletions

diff --git a/common/bulk/driver.cxx b/common/bulk/driver.cxx
index 06bd06c..d6a294a 100644
--- a/common/bulk/driver.cxx
+++ b/common/bulk/driver.cxx
@@ -327,13 +327,6 @@ main (int argc, char* argv[])
         test (db, v.begin (), v.end ());
       }
 
-      {
-        auto_ptr<auto_object> a[2];
-        a[0].reset (new auto_object (1, "a"));
-        a[1].reset (new auto_object (2, "b"));
-        test (db, a, a + sizeof (a) / sizeof (a[0]));
-      }
-
 #ifdef HAVE_CXX11
       {
         vector<unique_ptr<unique_object>> v;
@@ -341,6 +334,13 @@ main (int argc, char* argv[])
         v.push_back (unique_ptr<unique_object> (new unique_object (2, "b")));
         test (db, v.begin (), v.end ());
       }
+#else
+      {
+        auto_ptr<auto_object> a[2];
+        a[0].reset (new auto_object (1, "a"));
+        a[1].reset (new auto_object (2, "b"));
+        test (db, a, a + sizeof (a) / sizeof (a[0]));
+      }
 #endif
 
       {
@@ -981,13 +981,6 @@ main (int argc, char* argv[])
         test (db, v.begin (), v.end ());
       }
 
-      {
-        auto_ptr<auto_object> a[2];
-        a[0].reset (new auto_object (1, "a"));
-        a[1].reset (new auto_object (2, "b"));
-        test (db, a, a + sizeof (a) / sizeof (a[0]));
-      }
-
 #ifdef HAVE_CXX11
       {
         vector<unique_ptr<unique_object>> v;
@@ -995,6 +988,13 @@ main (int argc, char* argv[])
         v.push_back (unique_ptr<unique_object> (new unique_object (2, "b")));
         test (db, v.begin (), v.end ());
       }
+#else
+      {
+        auto_ptr<auto_object> a[2];
+        a[0].reset (new auto_object (1, "a"));
+        a[1].reset (new auto_object (2, "b"));
+        test (db, a, a + sizeof (a) / sizeof (a[0]));
+      }
 #endif
 
       {