Changeset 10852

Timestamp:

Nov 24, 2015, 10:46:44 PM (9 years ago)

Author:

landauf

Message:

changed some small details (after reviewing r10817)

Location:

code/branches/cpp11_v2/src/libraries

Files:

• core/LuaState.cc (modified) (1 diff)
• tools/BulletDebugDrawer.h (modified) (2 diffs)
• util/ExprParser.cc (modified) (2 diffs)
• util/ExprParser.h (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/core/LuaState.cc

@@ -33 +33 @@
 extern "C" {
 #include <lua.h>
-#include <lualib.h>     
+#include <lualib.h>
 }
 #include <loki/ScopeGuard.h>

code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h

@@ -24 +24 @@
             ~BulletDebugDrawer();
             virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& color) override;
-//            virtual void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar);
+//            virtual void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar) override;
             virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color) override;
             virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) override;
@@ -31 +31 @@
             virtual void drawCylinder(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color) override;
             virtual void drawCone(btScalar radius, btScalar height, int upAxis, const btTransform& transform, const btVector3& color) override;
-//            virtual void drawPlane(const btVector3& planeNormal, btScalar planeConst, const btTransform& transform, const btVector3& color);
+//            virtual void drawPlane(const btVector3& planeNormal, btScalar planeConst, const btTransform& transform, const btVector3& color) override;
 
             virtual void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color) override;

code/branches/cpp11_v2/src/libraries/util/ExprParser.cc

@@ -391 +391 @@
     }
 
-    char* ExprParser::parse_word(char* str)
+    void ExprParser::parse_word(char* str)
     {
         char* word = str;
@@ -402 +402 @@
             {
                 this->failed_ = true;
-                return str;
+                return;
             }
         };
         *word = '\0';
-        return str;
     }
 

code/branches/cpp11_v2/src/libraries/util/ExprParser.h

@@ -139 +139 @@
         float parse_expr_7();
         float parse_expr_8();
-        char* parse_word(char* str);
+        void parse_word(char* str);
         binary_operator parse_binary_operator();
         unary_operator parse_unary_operator();