Minor refactoring.

TRAC #15551 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@563 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 05a5d8e0
#define MAJOR_VERSION 0 #define MAJOR_VERSION 0
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 562 #define BUILD_REVISION 563
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
...@@ -26,26 +26,17 @@ public: ...@@ -26,26 +26,17 @@ public:
bool operator==(const int i) const bool operator==(const int i) const
{ {
if (i == iConst) return i == iConst;
return true;
return false;
} }
bool operator==(const float f) const bool operator==(const float f) const
{ {
if (f == fConst) return f == fConst;
return true;
return false;
} }
bool operator==(const bool b) const bool operator==(const bool b) const
{ {
if (b == bConst) return b == bConst;
return true;
return false;
} }
bool operator==(const ConstantUnion& constant) const bool operator==(const ConstantUnion& constant) const
...@@ -55,20 +46,11 @@ public: ...@@ -55,20 +46,11 @@ public:
switch (type) { switch (type) {
case EbtInt: case EbtInt:
if (constant.iConst == iConst) return constant.iConst == iConst;
return true;
break;
case EbtFloat: case EbtFloat:
if (constant.fConst == fConst) return constant.fConst == fConst;
return true;
break;
case EbtBool: case EbtBool:
if (constant.bConst == bConst) return constant.bConst == bConst;
return true;
break;
} }
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment