build on gcc 3.4.3

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;
   }

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; ni<strip_prefix.size(); ++ ni) {
+  for (unsigned int ni = 0; ni < strip_prefix.size(); ++ni) {
     string axe_name = strip_prefix[ni];
-    if (this->get_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);

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;
   }
 }

panda/src/express/weakPointerTo.I

@@ -60,7 +60,7 @@ template<class T>
 INLINE TYPENAME WeakPointerTo<T>::To &WeakPointerTo<T>::
 operator *() const {
   nassertr(!this->was_deleted(), *((To *)NULL));
-  return *((To *)_void_ptr);
+  return *((To *)WeakPointerToBase<T>::_void_ptr);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@ template<class T>
 INLINE TYPENAME WeakPointerTo<T>::To *WeakPointerTo<T>::
 operator -> () const {
   nassertr(!this->was_deleted(), (To *)NULL);
-  return (To *)_void_ptr;
+  return (To *)WeakPointerToBase<T>::_void_ptr;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -89,7 +89,7 @@ template<class T>
 INLINE WeakPointerTo<T>::
 operator TYPENAME WeakPointerToBase<T>::To *() const {
   nassertr(!this->was_deleted(), (To *)NULL);
-  return (To *)_void_ptr;
+  return (To *)WeakPointerToBase<T>::_void_ptr;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -103,7 +103,7 @@ template<class T>
 INLINE TYPENAME WeakPointerTo<T>::To *WeakPointerTo<T>::
 p() const {
   nassertr(!this->was_deleted(), (To *)NULL);
-  return (To *)_void_ptr;
+  return (To *)WeakPointerToBase<T>::_void_ptr;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -150,7 +150,7 @@ operator = (const WeakPointerTo<T> &copy) {
 template<class T>
 INLINE WeakConstPointerTo<T>::
 WeakConstPointerTo(const To *ptr) :
-  WeakPointerToBase<T>((WeakConstPointerTo<T>::To *)ptr)
+  WeakPointerToBase<T>((TYPENAME WeakConstPointerTo<T>::To *)ptr)
 {
 }
 
@@ -211,7 +211,7 @@ template<class T>
 INLINE const TYPENAME WeakConstPointerTo<T>::To &WeakConstPointerTo<T>::
 operator *() const {
   nassertr(!this->was_deleted(), *((To *)NULL));
-  return *((To *)_void_ptr);
+  return *((To *)WeakPointerToBase<T>::_void_ptr);
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -223,7 +223,7 @@ template<class T>
 INLINE const TYPENAME WeakConstPointerTo<T>::To *WeakConstPointerTo<T>::
 operator -> () const {
   nassertr(!this->was_deleted(), (To *)NULL);
-  return (To *)_void_ptr;
+  return (To *)WeakPointerToBase<T>::_void_ptr;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -241,7 +241,7 @@ template<class T>
 INLINE WeakConstPointerTo<T>::
 operator const TYPENAME WeakPointerToBase<T>::To *() const {
   nassertr(!this->was_deleted(), (To *)NULL);
-  return (To *)_void_ptr;
+  return (To *)WeakPointerToBase<T>::_void_ptr;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -255,7 +255,7 @@ template<class T>
 INLINE const TYPENAME WeakConstPointerTo<T>::To *WeakConstPointerTo<T>::
 p() const {
   nassertr(!this->was_deleted(), (To *)NULL);
-  return (To *)_void_ptr;
+  return (To *)WeakPointerToBase<T>::_void_ptr;
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/pgraph/pandaNode.cxx

@@ -373,8 +373,8 @@ PandaNode::
 PandaNode::
 PandaNode(const PandaNode &copy) :
   TypedWritable(copy),
-  Namable(copy),
-  ReferenceCount(copy)
+  ReferenceCount(copy),
+  Namable(copy)
 {
   // Copying a node does not copy its children.
 

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;
         }