Explorar o código

Compile fixes for compilers that don't support all C++11 features

rdb %!s(int64=8) %!d(string=hai) anos
pai
achega
8ec4da2824

+ 1 - 1
makepanda/makepanda.py

@@ -1290,7 +1290,7 @@ def CompileCxx(obj,src,opts):
         cmd += " -fno-strict-aliasing"
 
         if optlevel >= 3:
-            cmd += " -ffast-math -fno-stack-protector -fno-stack-check"
+            cmd += " -ffast-math -fno-stack-protector"
         if optlevel == 3:
             # Fast math is nice, but we'd like to see NaN in dev builds.
             cmd += " -fno-finite-math-only"

+ 1 - 1
panda/src/gobj/geom.h

@@ -435,7 +435,7 @@ public:
 
 private:
   const Geom *_object;
-  Thread *const _current_thread;
+  Thread *_current_thread;
   const Geom::CData *_cdata;
 
 public:

+ 1 - 1
panda/src/gobj/geomPrimitive.h

@@ -389,7 +389,7 @@ public:
 
 private:
   CPT(GeomPrimitive) _object;
-  Thread *const _current_thread;
+  Thread *_current_thread;
   const GeomPrimitive::CData *_cdata;
 
   CPT(GeomVertexArrayData) _vertices;

+ 5 - 9
panda/src/gobj/geomVertexData.h

@@ -409,6 +409,10 @@ protected:
                                     Thread *current_thread,
                                     GeomVertexData::CData *cdata);
 
+private:
+  GeomVertexDataPipelineBase(const GeomVertexDataPipelineBase &copy) DELETED;
+  GeomVertexDataPipelineBase &operator = (const GeomVertexDataPipelineBase &copy) DELETED_ASSIGN;
+
 public:
   INLINE ~GeomVertexDataPipelineBase();
 
@@ -429,7 +433,7 @@ public:
 
 protected:
   PT(GeomVertexData) _object;
-  Thread *const _current_thread;
+  Thread *_current_thread;
   GeomVertexData::CData *_cdata;
 };
 
@@ -441,11 +445,7 @@ class EXPCL_PANDA_GOBJ GeomVertexDataPipelineReader : public GeomVertexDataPipel
 public:
   INLINE GeomVertexDataPipelineReader(Thread *current_thread);
   INLINE GeomVertexDataPipelineReader(const GeomVertexData *object, Thread *current_thread);
-private:
-  GeomVertexDataPipelineReader(const GeomVertexDataPipelineReader &copy) DELETED;
-  GeomVertexDataPipelineReader &operator = (const GeomVertexDataPipelineReader &copy) DELETED_ASSIGN;
 
-public:
   ALLOC_DELETED_CHAIN(GeomVertexDataPipelineReader);
 
   INLINE void set_object(CPT(GeomVertexData) object);
@@ -509,11 +509,7 @@ class EXPCL_PANDA_GOBJ GeomVertexDataPipelineWriter : public GeomVertexDataPipel
 public:
   INLINE GeomVertexDataPipelineWriter(GeomVertexData *object, bool force_to_0,
                                       Thread *current_thread);
-private:
-  GeomVertexDataPipelineWriter(const GeomVertexDataPipelineWriter &copy) DELETED;
-  GeomVertexDataPipelineWriter &operator = (const GeomVertexDataPipelineWriter &copy) DELETED_ASSIGN;
 
-public:
   INLINE ~GeomVertexDataPipelineWriter();
   ALLOC_DELETED_CHAIN(GeomVertexDataPipelineWriter);