Merge pull request #268 from ngageoint/sync_externals

Sync externals
ngageoint · Mar 12, 2019 · 1d8daab · 1d8daab
2 parents 6eeb669 + 4783954
commit 1d8daab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/externals/coda-oss/modules/c++/mem/include/mem/ScopedCopyablePtr.h b/externals/coda-oss/modules/c++/mem/include/mem/ScopedCopyablePtr.h
@@ -109,16 +109,13 @@ class ScopedCopyablePtr
     }
 
     // explicit operators not supported until C++11
-    bool toBool() const
-    {
-        return get() == NULL ? false : true;
-    }
 #ifdef __CODA_CPP11
-    explicit operator bool() const
+    explicit
+#endif
+    operator bool() const
     {
-        return toBool();
+        return get() == NULL ? false : true;
     }
-#endif
 
     T* get() const
     {

diff --git a/six/modules/python/cphd/source/generated/cphd_wrap.cxx b/six/modules/python/cphd/source/generated/cphd_wrap.cxx
@@ -31846,7 +31846,7 @@ SWIGINTERN PyObject *_wrap_new_CPHDReader__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   SwigValueWrapper< mem::SharedPtr< io::SeekableInputStream > > arg1 ;
   size_t arg2 ;
-  mem::SharedPtr< logging::Logger > arg3 ;
+  SwigValueWrapper< mem::SharedPtr< logging::Logger > > arg3 ;
   void *argp1 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -32001,7 +32001,7 @@ SWIGINTERN PyObject *_wrap_new_CPHDReader__SWIG_2(PyObject *SWIGUNUSEDPARM(self)
   PyObject *resultobj = 0;
   std::string *arg1 = 0 ;
   size_t arg2 ;
-  mem::SharedPtr< logging::Logger > arg3 ;
+  SwigValueWrapper< mem::SharedPtr< logging::Logger > > arg3 ;
   int res1 = SWIG_OLDOBJ ;
   size_t val2 ;
   int ecode2 = 0 ;