[Orxonox-commit 6194] r10852 - in code/branches/cpp11_v2/src/libraries: core tools util

[landauf at orxonox.net]

Author: landauf
Date: 2015-11-24 22:46:44 +0100 (Tue, 24 Nov 2015)
New Revision: 10852

Modified:
   code/branches/cpp11_v2/src/libraries/core/LuaState.cc
   code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
   code/branches/cpp11_v2/src/libraries/util/ExprParser.cc
   code/branches/cpp11_v2/src/libraries/util/ExprParser.h
Log:
changed some small details (after reviewing r10817)

Modified: code/branches/cpp11_v2/src/libraries/core/LuaState.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/LuaState.cc	2015-11-24 21:37:28 UTC (rev 10851)
+++ code/branches/cpp11_v2/src/libraries/core/LuaState.cc	2015-11-24 21:46:44 UTC (rev 10852)
@@ -32,7 +32,7 @@
 #include <tolua++.h>
 extern "C" {
 #include <lua.h>
-#include <lualib.h>	
+#include <lualib.h>
 }
 #include <loki/ScopeGuard.h>
 

Modified: code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h	2015-11-24 21:37:28 UTC (rev 10851)
+++ code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h	2015-11-24 21:46:44 UTC (rev 10852)
@@ -23,14 +23,14 @@
             BulletDebugDrawer(Ogre::SceneManager* sceneManager);
             ~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;
             virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btVector3& color) override;
             virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btTransform& trans, const btVector3& color) override;
             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;
 

Modified: code/branches/cpp11_v2/src/libraries/util/ExprParser.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/ExprParser.cc	2015-11-24 21:37:28 UTC (rev 10851)
+++ code/branches/cpp11_v2/src/libraries/util/ExprParser.cc	2015-11-24 21:46:44 UTC (rev 10852)
@@ -390,7 +390,7 @@
         }
     }
 
-    char* ExprParser::parse_word(char* str)
+    void ExprParser::parse_word(char* str)
     {
         char* word = str;
         int counter = 0;
@@ -401,11 +401,10 @@
             if (counter > 255)
             {
                 this->failed_ = true;
-                return str;
+                return;
             }
         };
         *word = '\0';
-        return str;
     }
 
     ExprParser::binary_operator ExprParser::parse_binary_operator()

Modified: code/branches/cpp11_v2/src/libraries/util/ExprParser.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/ExprParser.h	2015-11-24 21:37:28 UTC (rev 10851)
+++ code/branches/cpp11_v2/src/libraries/util/ExprParser.h	2015-11-24 21:46:44 UTC (rev 10852)
@@ -138,7 +138,7 @@
         float parse_expr_6();
         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();