From 8ec4da2824c166c9242bc218876970836c584781 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 21 Feb 2017 02:43:56 +0100 Subject: [PATCH] Compile fixes for compilers that don't support all C++11 features --- makepanda/makepanda.py | 2 +- panda/src/gobj/geom.h | 2 +- panda/src/gobj/geomPrimitive.h | 2 +- panda/src/gobj/geomVertexData.h | 14 +++++--------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index adc2064f21..f782898df5 100755 --- a/makepanda/makepanda.py +++ b/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" diff --git a/panda/src/gobj/geom.h b/panda/src/gobj/geom.h index 0ed8cc5193..a1408878d8 100644 --- a/panda/src/gobj/geom.h +++ b/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: diff --git a/panda/src/gobj/geomPrimitive.h b/panda/src/gobj/geomPrimitive.h index 41c575acd4..0880e77c7a 100644 --- a/panda/src/gobj/geomPrimitive.h +++ b/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; diff --git a/panda/src/gobj/geomVertexData.h b/panda/src/gobj/geomVertexData.h index 0261c05a93..8e236029ae 100644 --- a/panda/src/gobj/geomVertexData.h +++ b/panda/src/gobj/geomVertexData.h @@ -409,6 +409,10 @@ protected: Thread *current_thread, GeomVertexData::CData *cdata); +private: + GeomVertexDataPipelineBase(const GeomVertexDataPipelineBase ©) DELETED; + GeomVertexDataPipelineBase &operator = (const GeomVertexDataPipelineBase ©) 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 ©) DELETED; - GeomVertexDataPipelineReader &operator = (const GeomVertexDataPipelineReader ©) 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 ©) DELETED; - GeomVertexDataPipelineWriter &operator = (const GeomVertexDataPipelineWriter ©) DELETED_ASSIGN; -public: INLINE ~GeomVertexDataPipelineWriter(); ALLOC_DELETED_CHAIN(GeomVertexDataPipelineWriter);