aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/glsl
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-08-28 14:56:04 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2014-08-28 17:58:33 +0200
commit703f36a4b8733a515093e2d1d85a3136728269eb (patch)
treebcbdf3efe489a651d5bd9608eebad85c704c6ba3 /src/libs/glsl
parent12642cc49a37e50eb3b099bfd34c28e6259b7526 (diff)
C++: remove reserved names.
See [global.names] (17.6.4.3.2 in the C++11 spec.) Change-Id: I8434496dbe392b52d339d5f17cfaeee8dbd88995 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/libs/glsl')
-rw-r--r--src/libs/glsl/glslengine.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/glsl/glslengine.h b/src/libs/glsl/glslengine.h
index 3a57d70d76..2999956c88 100644
--- a/src/libs/glsl/glslengine.h
+++ b/src/libs/glsl/glslengine.h
@@ -72,20 +72,20 @@ private:
int _line;
};
-template <typename _Type>
+template <typename Type>
class TypeTable
{
public:
- struct Compare: std::binary_function<_Type, _Type, bool> {
- bool operator()(const _Type &value, const _Type &other) const {
+ struct Compare: std::binary_function<Type, Type, bool> {
+ bool operator()(const Type &value, const Type &other) const {
return value.isLessThan(&other);
}
};
- const _Type *intern(const _Type &ty) { return &*_entries.insert(ty).first; }
+ const Type *intern(const Type &ty) { return &*_entries.insert(ty).first; }
private:
- std::set<_Type, Compare> _entries;
+ std::set<Type, Compare> _entries;
};
class GLSL_EXPORT Engine