From 86ce5ebba10c97f6578627144300d3a8eb0799c7 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 13 Jul 2005 19:33:07 +0000 Subject: [PATCH] build on Irix --- panda/src/display/graphicsStateGuardian.I | 2 +- panda/src/egg2pg/eggLoader.h | 1 + panda/src/particlesystem/colorInterpolationManager.I | 5 +++-- panda/src/pgui/pgItem.h | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/panda/src/display/graphicsStateGuardian.I b/panda/src/display/graphicsStateGuardian.I index 778eccb3b2..f9a89f7cd8 100644 --- a/panda/src/display/graphicsStateGuardian.I +++ b/panda/src/display/graphicsStateGuardian.I @@ -47,7 +47,7 @@ ClipPlaneInfo() { //////////////////////////////////////////////////////////////////// INLINE void GraphicsStateGuardian:: release_all() { - return _prepared_objects->release_all(); + _prepared_objects->release_all(); } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/egg2pg/eggLoader.h b/panda/src/egg2pg/eggLoader.h index 71e8e97f75..4184889556 100644 --- a/panda/src/egg2pg/eggLoader.h +++ b/panda/src/egg2pg/eggLoader.h @@ -28,6 +28,7 @@ #include "eggGroup.h" #include "eggMaterial.h" #include "pt_EggMaterial.h" +#include "eggVertexPool.h" #include "texture.h" #include "pandaNode.h" #include "pointerTo.h" diff --git a/panda/src/particlesystem/colorInterpolationManager.I b/panda/src/particlesystem/colorInterpolationManager.I index 7856d83ff7..7c63cbf360 100755 --- a/panda/src/particlesystem/colorInterpolationManager.I +++ b/panda/src/particlesystem/colorInterpolationManager.I @@ -270,10 +270,11 @@ get_segment(const int seg_id) { INLINE string ColorInterpolationManager:: get_segment_id_list(void) { pvector::iterator iter; - stringstream output; + ostringstream output; for(iter = _i_segs.begin();iter != _i_segs.end();++iter) output << (*iter)->get_id() << " "; - return output.str().substr(0,output.str().length()-1); + string str = output.str(); + return str.substr(0, str.length()-1); } diff --git a/panda/src/pgui/pgItem.h b/panda/src/pgui/pgItem.h index 8f7464886d..8aa7deba07 100644 --- a/panda/src/pgui/pgItem.h +++ b/panda/src/pgui/pgItem.h @@ -28,6 +28,7 @@ #include "nodePath.h" #include "luse.h" #include "pointerTo.h" +#include "audioSound.h" #include "textNode.h" #include "pmap.h"