C++17 stuff. NB regression suite is not passing.

highperformancecoder · Nov 28, 2023 · ce49871 · ce49871
1 parent 41bc362
commit ce49871
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/classdesc b/classdesc
diff --git a/graphcode b/graphcode
diff --git a/include/TCL_obj_base.h b/include/TCL_obj_base.h
@@ -92,6 +92,11 @@ namespace ecolab
 #pragma omit TCL_obj ecolab::TCL_args
 #endif
 
+#if defined(__GNUC__) && !defined(__ICC)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+
   /// RAII TCL_Obj ref
   class TCLObjRef
   {
@@ -102,13 +107,19 @@ namespace ecolab
     ~TCLObjRef() {Tcl_DecrRefCount(ref);}
     TCLObjRef(const TCLObjRef& x): ref(x.ref) {Tcl_IncrRefCount(ref);}
     TCLObjRef& operator=(const TCLObjRef& x) {
+      Tcl_DecrRefCount(ref);
       ref=x.ref;
       Tcl_IncrRefCount(ref);
       return *this;
     }
     Tcl_Obj* get() const {return ref;}
   };
 
+#if defined(__GNUC__) && !defined(__ICC)
+#pragma GCC diagnostic pop
+#endif
+
+
   /// count class that exposes const public attribute
   class TCL_args_count
   {

diff --git a/models/Stupid_Project/Makefile b/models/Stupid_Project/Makefile
@@ -13,6 +13,10 @@ include $(ECOLAB_HOME)/include/Makefile
 
 MODELS=stupid01 stupid02 stupid03 stupid04 stupid05 stupid06 stupid09 stupid10 stupid11 stupid12 stupid14 stupid15 stupid16
 
+# graphcode uses std::iterator, which is deprecated
+# I don't know why the compiler is flagging Cell as uninitialised
+CXXFLAGS+=-Wno-deprecated-declarations -Wno-maybe-uninitialized
+
 ifdef TK
 MODELS+=stupid-field
 endif

diff --git a/models/ecolab_model.h b/models/ecolab_model.h
@@ -23,6 +23,7 @@ using classdesc::Object;
 class ecolab_point: public Object<ecolab_point,GRAPHCODE_NS::object>
 {
 protected:
+  using Object<ecolab_point,GRAPHCODE_NS::object>::pack;
   // override object::pack
   template <class A, class M> 
   A pack(const A& e, const M& mask, long ntrue=-1)
+1 −1		classdesc.cc
+1 −1		examples/polymorph.cc
+1 −1		examples/polymorph2.cc
+1 −0		json_pack_base.h
+0 −16		json_pack_epilogue.h
+2 −0		multiArray.h
+11 −1		pack_base.h
+6 −4		pack_stl.h
+1 −1		test/c++11/Makefile
+1 −1		test/testJsonSharedPtr.cc