Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10852


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cpp11_v2/src/libraries/core/LuaState.cc

    r10821 r10852  
    3333extern "C" {
    3434#include <lua.h>
    35 #include <lualib.h>     
     35#include <lualib.h>
    3636}
    3737#include <loki/ScopeGuard.h>
  • code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h

    r10845 r10852  
    2424            ~BulletDebugDrawer();
    2525            virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& color) override;
    26 //            virtual void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar);
     26//            virtual void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar) override;
    2727            virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color) override;
    2828            virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) override;
     
    3131            virtual void drawCylinder(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color) override;
    3232            virtual void drawCone(btScalar radius, btScalar height, int upAxis, const btTransform& transform, const btVector3& color) override;
    33 //            virtual void drawPlane(const btVector3& planeNormal, btScalar planeConst, const btTransform& transform, const btVector3& color);
     33//            virtual void drawPlane(const btVector3& planeNormal, btScalar planeConst, const btTransform& transform, const btVector3& color) override;
    3434
    3535            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

    r10817 r10852  
    391391    }
    392392
    393     char* ExprParser::parse_word(char* str)
     393    void ExprParser::parse_word(char* str)
    394394    {
    395395        char* word = str;
     
    402402            {
    403403                this->failed_ = true;
    404                 return str;
     404                return;
    405405            }
    406406        };
    407407        *word = '\0';
    408         return str;
    409408    }
    410409
  • code/branches/cpp11_v2/src/libraries/util/ExprParser.h

    r8858 r10852  
    139139        float parse_expr_7();
    140140        float parse_expr_8();
    141         char* parse_word(char* str);
     141        void parse_word(char* str);
    142142        binary_operator parse_binary_operator();
    143143        unary_operator parse_unary_operator();
Note: See TracChangeset for help on using the changeset viewer.