From 61c5bff601fefd25c848d17e32e50133d64b2092 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 16 May 2005 22:17:54 +0000 Subject: [PATCH] build on gcc 3.4.3 --- panda/src/downloader/httpAuthorization.cxx | 4 ++-- panda/src/egg/eggGroupNode.cxx | 4 ++-- panda/src/event/buttonEvent.cxx | 10 ++++++++++ panda/src/express/weakPointerTo.I | 18 +++++++++--------- panda/src/pgraph/pandaNode.cxx | 4 ++-- pandatool/src/maya/mayaShaderColorDef.cxx | 10 ++++++---- 6 files changed, 31 insertions(+), 19 deletions(-) diff --git a/panda/src/downloader/httpAuthorization.cxx b/panda/src/downloader/httpAuthorization.cxx index 4118878651..91344bbec5 100644 --- a/panda/src/downloader/httpAuthorization.cxx +++ b/panda/src/downloader/httpAuthorization.cxx @@ -258,10 +258,10 @@ base64_decode(const string &s) { } for (int i = 0; i < 64; i++) { - base64_invert[base64_table[i]] = i; + base64_invert[(int)base64_table[i]] = i; } - base64_invert['='] = 0; + base64_invert[(int)'='] = 0; got_base64_invert = true; } diff --git a/panda/src/egg/eggGroupNode.cxx b/panda/src/egg/eggGroupNode.cxx index 65d7d84026..f4b6fdb742 100644 --- a/panda/src/egg/eggGroupNode.cxx +++ b/panda/src/egg/eggGroupNode.cxx @@ -774,9 +774,9 @@ mesh_triangles(int flags) { int EggGroupNode:: rename_nodes(vector_string strip_prefix, bool recurse) { int num_renamed = 0; - for (unsigned int ni=0; niget_name().find(axe_name)!= -1) { + if (this->get_name().substr(0, axe_name.size()) == axe_name) { string new_name = this->get_name().substr(axe_name.size()); //cout << "renaming " << this->get_name() << "->" << new_name << endl; this->set_name(new_name); diff --git a/panda/src/event/buttonEvent.cxx b/panda/src/event/buttonEvent.cxx index ad361abaff..8e6aa26abf 100644 --- a/panda/src/event/buttonEvent.cxx +++ b/panda/src/event/buttonEvent.cxx @@ -51,6 +51,10 @@ output(ostream &out) const { << TextEncoder::encode_wtext(_candidate_string, TextEncoder::get_default_encoding()); break; + + case T_move: + out << "move"; + break; } } @@ -86,6 +90,9 @@ write_datagram(Datagram &dg) const { dg.add_uint16(_highlight_start); dg.add_uint16(_highlight_end); dg.add_uint16(_cursor_pos); + + case T_move: + break; } } @@ -114,5 +121,8 @@ read_datagram(DatagramIterator &scan) { _highlight_start = scan.get_uint16(); _highlight_end = scan.get_uint16(); _cursor_pos = scan.get_uint16(); + + case T_move: + break; } } diff --git a/panda/src/express/weakPointerTo.I b/panda/src/express/weakPointerTo.I index 22c2aa7120..8c2d0d435a 100644 --- a/panda/src/express/weakPointerTo.I +++ b/panda/src/express/weakPointerTo.I @@ -60,7 +60,7 @@ template INLINE TYPENAME WeakPointerTo::To &WeakPointerTo:: operator *() const { nassertr(!this->was_deleted(), *((To *)NULL)); - return *((To *)_void_ptr); + return *((To *)WeakPointerToBase::_void_ptr); } //////////////////////////////////////////////////////////////////// @@ -72,7 +72,7 @@ template INLINE TYPENAME WeakPointerTo::To *WeakPointerTo:: operator -> () const { nassertr(!this->was_deleted(), (To *)NULL); - return (To *)_void_ptr; + return (To *)WeakPointerToBase::_void_ptr; } //////////////////////////////////////////////////////////////////// @@ -89,7 +89,7 @@ template INLINE WeakPointerTo:: operator TYPENAME WeakPointerToBase::To *() const { nassertr(!this->was_deleted(), (To *)NULL); - return (To *)_void_ptr; + return (To *)WeakPointerToBase::_void_ptr; } //////////////////////////////////////////////////////////////////// @@ -103,7 +103,7 @@ template INLINE TYPENAME WeakPointerTo::To *WeakPointerTo:: p() const { nassertr(!this->was_deleted(), (To *)NULL); - return (To *)_void_ptr; + return (To *)WeakPointerToBase::_void_ptr; } //////////////////////////////////////////////////////////////////// @@ -150,7 +150,7 @@ operator = (const WeakPointerTo ©) { template INLINE WeakConstPointerTo:: WeakConstPointerTo(const To *ptr) : - WeakPointerToBase((WeakConstPointerTo::To *)ptr) + WeakPointerToBase((TYPENAME WeakConstPointerTo::To *)ptr) { } @@ -211,7 +211,7 @@ template INLINE const TYPENAME WeakConstPointerTo::To &WeakConstPointerTo:: operator *() const { nassertr(!this->was_deleted(), *((To *)NULL)); - return *((To *)_void_ptr); + return *((To *)WeakPointerToBase::_void_ptr); } //////////////////////////////////////////////////////////////////// @@ -223,7 +223,7 @@ template INLINE const TYPENAME WeakConstPointerTo::To *WeakConstPointerTo:: operator -> () const { nassertr(!this->was_deleted(), (To *)NULL); - return (To *)_void_ptr; + return (To *)WeakPointerToBase::_void_ptr; } //////////////////////////////////////////////////////////////////// @@ -241,7 +241,7 @@ template INLINE WeakConstPointerTo:: operator const TYPENAME WeakPointerToBase::To *() const { nassertr(!this->was_deleted(), (To *)NULL); - return (To *)_void_ptr; + return (To *)WeakPointerToBase::_void_ptr; } //////////////////////////////////////////////////////////////////// @@ -255,7 +255,7 @@ template INLINE const TYPENAME WeakConstPointerTo::To *WeakConstPointerTo:: p() const { nassertr(!this->was_deleted(), (To *)NULL); - return (To *)_void_ptr; + return (To *)WeakPointerToBase::_void_ptr; } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/pgraph/pandaNode.cxx b/panda/src/pgraph/pandaNode.cxx index 5c8e9e7747..1e43aaee8f 100644 --- a/panda/src/pgraph/pandaNode.cxx +++ b/panda/src/pgraph/pandaNode.cxx @@ -373,8 +373,8 @@ PandaNode:: PandaNode:: PandaNode(const PandaNode ©) : TypedWritable(copy), - Namable(copy), - ReferenceCount(copy) + ReferenceCount(copy), + Namable(copy) { // Copying a node does not copy its children. diff --git a/pandatool/src/maya/mayaShaderColorDef.cxx b/pandatool/src/maya/mayaShaderColorDef.cxx index a917cfacaa..40212ae5b0 100644 --- a/pandatool/src/maya/mayaShaderColorDef.cxx +++ b/pandatool/src/maya/mayaShaderColorDef.cxx @@ -333,7 +333,7 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) { //maya_cat.debug() << pla[j].name() << " is(pla) " << pla[j].node().apiTypeStr() << endl; string pla_name = pla[j].name().asChar(); // sometimes, by default, maya gives a outAlpha on subsequent plugs, ignore that - if (pla_name.find("outAlpha") != -1) { + if (pla_name.find("outAlpha") != string::npos) { maya_cat.debug() << pl.name() << " ignoring: " << pla_name << endl; continue; } @@ -342,9 +342,10 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) { MayaShaderColorDef *color_p = new MayaShaderColorDef; color_p->read_surface_color(shader, pla[j].node()); color_p->_texture_name.assign(pla[j].name().asChar()); - int loc = color_p->_texture_name.find('.',0); - if( loc != string::npos ) + size_t loc = color_p->_texture_name.find('.',0); + if (loc != string::npos) { color_p->_texture_name.resize(loc); + } maya_cat.debug() << "uv_name : " << color_p->_texture_name << endl; } else { @@ -352,8 +353,9 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) { read_surface_color(shader, pla[j].node()); _texture_name.assign(pla[j].name().asChar()); int loc = _texture_name.find('.',0); - if( loc != string::npos ) + if (loc != string::npos) { _texture_name.resize(loc); + } maya_cat.debug() << "uv_name : " << _texture_name << endl; first = false; }