TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rdb 2017-02-21 02:43:56 +01:00
parent 1eaa1bcf70
commit 8ec4da2824
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepanda.py
View File

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

2
panda/src/gobj/geom.h
View File

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

2
panda/src/gobj/geomPrimitive.h
View File

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

14
panda/src/gobj/geomVertexData.h
View File

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