changeset 12665:393b940d7ee2 octave-forge

pq_connection.h: Call register_type() only once.
author i7tiol
date Wed, 08 Jul 2015 13:54:27 +0000
parents f4b39e33e0d0
children fc325d64210b
files main/database/src/pq_connection.h main/database/src/pq_exec.cc
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/database/src/pq_connection.h	Wed Jul 08 08:37:06 2015 +0000
+++ b/main/database/src/pq_connection.h	Wed Jul 08 13:54:27 2015 +0000
@@ -84,7 +84,12 @@
   {
     static bool type_registered = false;
 
-    if (! type_registered) register_type ();
+    if (! type_registered)
+      {
+        register_type ();
+
+        type_registered = true;
+      }
   }
 
   ~octave_pq_connection (void) { delete rep; }
--- a/main/database/src/pq_exec.cc	Wed Jul 08 08:37:06 2015 +0000
+++ b/main/database/src/pq_exec.cc	Wed Jul 08 13:54:27 2015 +0000
@@ -131,7 +131,7 @@
       return retval;
     }
 
-  const octave_base_value& rep = (args(0).get_rep ());
+  const octave_base_value &rep = args(0).get_rep ();
 
   const octave_pq_connection &oct_pq_conn =
     dynamic_cast<const octave_pq_connection&> (rep);