From 1082e75d87fda8e7abe7d7c9eabfea6897f9017d Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Thu, 20 Nov 2014 00:22:06 +0000
Subject: [PATCH] Fix more compiler warnings

---
 panda/src/collide/collisionFloorMesh.I   | 11 +++++------
 panda/src/collide/collisionFloorMesh.h   | 19 ++++++++-----------
 panda/src/collide/collisionRay.h         |  3 +--
 panda/src/collide/collisionTraverser.cxx |  4 ++--
 panda/src/gobj/shader.I                  |  2 +-
 panda/src/gobj/shader.h                  |  2 +-
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/panda/src/collide/collisionFloorMesh.I b/panda/src/collide/collisionFloorMesh.I
index 3ee05b3e0d..8b2c5465e1 100755
--- a/panda/src/collide/collisionFloorMesh.I
+++ b/panda/src/collide/collisionFloorMesh.I
@@ -56,24 +56,23 @@ add_vertex(const LPoint3 &vert) {
   _vertices.push_back(vert);
 }
 
-INLINE const unsigned int  CollisionFloorMesh::
+INLINE unsigned int  CollisionFloorMesh::
 get_num_vertices() const {
   return _vertices.size();
 }
 
-INLINE const LPoint3 CollisionFloorMesh::
+INLINE const LPoint3 &CollisionFloorMesh::
 get_vertex(unsigned int index) const {
   return _vertices[index];
 }
 
-INLINE const unsigned int  CollisionFloorMesh::
+INLINE unsigned int CollisionFloorMesh::
 get_num_triangles() const {
   return _triangles.size();
 }
 
-INLINE const LPoint3d CollisionFloorMesh::
+INLINE LPoint3i CollisionFloorMesh::
 get_triangle(unsigned int index) const {
   CollisionFloorMesh::TriangleIndices tri = _triangles[index];
-  return LPoint3d(tri.p1, tri.p2, tri.p3);
+  return LPoint3i(tri.p1, tri.p2, tri.p3);
 }
-
diff --git a/panda/src/collide/collisionFloorMesh.h b/panda/src/collide/collisionFloorMesh.h
index b162cb8f64..31a6b1d62d 100755
--- a/panda/src/collide/collisionFloorMesh.h
+++ b/panda/src/collide/collisionFloorMesh.h
@@ -41,19 +41,18 @@ public:
     PN_stdfloat max_y;
   } TriangleIndices;
 
-
 PUBLISHED:
 
   INLINE CollisionFloorMesh();
-  
+
   INLINE void add_vertex(const LPoint3 &vert);
   void add_triangle(unsigned int pointA, unsigned int pointB, unsigned int pointC);
 
-  INLINE const unsigned int get_num_vertices() const;
-  INLINE const LPoint3 get_vertex(unsigned int index) const;
+  INLINE unsigned int get_num_vertices() const;
+  INLINE const LPoint3 &get_vertex(unsigned int index) const;
   MAKE_SEQ(get_vertices, get_num_vertices, get_vertex);
-  INLINE const unsigned int get_num_triangles() const;
-  INLINE const LPoint3d get_triangle(unsigned int index) const;
+  INLINE unsigned int get_num_triangles() const;
+  INLINE LPoint3i get_triangle(unsigned int index) const;
   MAKE_SEQ(get_triangles, get_num_triangles, get_triangle);
 
   virtual LPoint3 get_collision_origin() const;
@@ -63,7 +62,7 @@ public:
   virtual CollisionSolid *make_copy();
 
 public:
-  
+
   virtual void xform(const LMatrix4 &mat);
 
   virtual PStatCollector &get_volume_pcollector();
@@ -90,7 +89,7 @@ private:
 
   Vertices _vertices;
   Triangles _triangles;
-  
+
   static PStatCollector _volume_pcollector;
   static PStatCollector _test_pcollector;
 
@@ -101,7 +100,7 @@ public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter* manager, Datagram &me);
 
-  static TypedWritable *make_CollisionFloorMesh(const FactoryParams &params);  
+  static TypedWritable *make_CollisionFloorMesh(const FactoryParams &params);
   static TypeHandle get_class_type() {
     return _type_handle;
   }
@@ -122,5 +121,3 @@ private:
 #include "collisionFloorMesh.I"
 
 #endif
-
-
diff --git a/panda/src/collide/collisionRay.h b/panda/src/collide/collisionRay.h
index 27eb84720d..a8a5861c43 100644
--- a/panda/src/collide/collisionRay.h
+++ b/panda/src/collide/collisionRay.h
@@ -18,8 +18,7 @@
 #include "pandabase.h"
 
 #include "collisionSolid.h"
-
-class LensNode;
+#include "lensNode.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : CollisionRay
diff --git a/panda/src/collide/collisionTraverser.cxx b/panda/src/collide/collisionTraverser.cxx
index 860f93a541..884bbb822b 100644
--- a/panda/src/collide/collisionTraverser.cxx
+++ b/panda/src/collide/collisionTraverser.cxx
@@ -235,8 +235,8 @@ get_num_colliders() const {
 ////////////////////////////////////////////////////////////////////
 NodePath CollisionTraverser::
 get_collider(int n) const {
-  nassertr(_ordered_colliders.size() == _colliders.size(), NULL);
-  nassertr(n >= 0 && n < (int)_ordered_colliders.size(), NULL);
+  nassertr(_ordered_colliders.size() == _colliders.size(), NodePath());
+  nassertr(n >= 0 && n < (int)_ordered_colliders.size(), NodePath());
   return _ordered_colliders[n]._node_path;
 }
 
diff --git a/panda/src/gobj/shader.I b/panda/src/gobj/shader.I
index 3c0d2c9db9..b33c3d1ff0 100755
--- a/panda/src/gobj/shader.I
+++ b/panda/src/gobj/shader.I
@@ -92,7 +92,7 @@ get_text(const ShaderType &type) const {
 //               error.  This doesn't tell you whether or not the
 //               shader is supported on the current video card.
 ////////////////////////////////////////////////////////////////////
-INLINE const bool Shader::
+INLINE bool Shader::
 get_error_flag() const {
   return _error_flag;
 }
diff --git a/panda/src/gobj/shader.h b/panda/src/gobj/shader.h
index 42a83cdc65..e62435d6a0 100755
--- a/panda/src/gobj/shader.h
+++ b/panda/src/gobj/shader.h
@@ -98,7 +98,7 @@ PUBLISHED:
 
   INLINE Filename get_filename(const ShaderType &type = ST_none) const;
   INLINE const string &get_text(const ShaderType &type = ST_none) const;
-  INLINE const bool get_error_flag() const;
+  INLINE bool get_error_flag() const;
   INLINE ShaderLanguage get_language() const;
 
   INLINE static ShaderUtilization get_shader_utilization();