Changeset 482 for cpp/frams

Timestamp:

03/26/16 01:32:18 (9 years ago)

Author:

Maciej Komosinski

Message:

Fixed: we want a reference to a static object, not a static reference to a temporary object

File:

• cpp/frams/util/extvalue.h (modified) (3 diffs)

cpp/frams/util/extvalue.h

@@ -14 +14 @@
 template <int A, int B> struct CompileTimeMax { enum { val = A > B ? A : B }; };
 #define EXTVALUEUNIONSIZE CompileTimeMax<sizeof(ExtObject),sizeof(SString)>::val
+
+//#define DEBUG_EXTOBJECT(txt) printf("%p ExtObj::" txt "\n",this)
+#define DEBUG_EXTOBJECT(txt) 
 
 enum ExtPType
@@ -70 +73 @@
         void setEmpty() { decref(); subtype = 0; param = NULL; object = NULL; }
         int isEmpty() const { return !param; }
-        static const ExtObject& empty() { static const ExtObject& e((ParamInterface*)NULL); return e; }
-        ExtObject(const ExtObject& src)      { src.incref(); copyFrom(src); }
+        static const ExtObject& empty() { static const ExtObject e((ParamInterface*)NULL); return e; }
+        ExtObject(const ExtObject& src)      { DEBUG_EXTOBJECT("(const&)"); src.incref(); copyFrom(src); }
         void operator=(const ExtObject& src) { src.incref(); decref(); copyFrom(src); }
         bool makeUnique();//< @return false if nothing has changed
@@ -81 +84 @@
         SString serialize(SerializationFormat format) const;
 
-        ExtObject(Param *p, void *o) :subtype(2), object(o), param(p){}
-        ExtObject(ParamInterface *p = 0) :subtype(0), object(0), paraminterface(p){}
-        ExtObject(Param *p, DestrBase *o) :subtype(1 + 2), dbobject(o), param(p){ incref(); }
-        ExtObject(ParamInterface *p, DestrBase *o) :subtype(1), dbobject(o), paraminterface(p){ incref(); }
-
-        ~ExtObject(){ decref(); }
+        ExtObject(Param *p, void *o) :subtype(2), object(o), param(p) { DEBUG_EXTOBJECT("(Param,void)");}
+        ExtObject(ParamInterface *p = 0) :subtype(0), object(0), paraminterface(p) { DEBUG_EXTOBJECT("(ParamInterface)"); }
+        ExtObject(Param *p, DestrBase *o) :subtype(1 + 2), dbobject(o), param(p){ DEBUG_EXTOBJECT("(Param,DestrBase)"); incref(); }
+        ExtObject(ParamInterface *p, DestrBase *o) :subtype(1), dbobject(o), paraminterface(p){ DEBUG_EXTOBJECT("(ParamInterface,DestrBase)"); incref(); }
+
+        ~ExtObject(){ DEBUG_EXTOBJECT("~"); decref(); }
 
         class Serialization