feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: remove reserved names.

Browse Source 
See [global.names] (17.6.4.3.2 in the C++11 spec.)

Change-Id: I8434496dbe392b52d339d5f17cfaeee8dbd88995
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2014-08-28 14:56:04 +02:00
committed by Nikolai Kosjar
parent 12642cc49a
commit 703f36a4b8
15 changed files with 169 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/glsl/glslengine.h
View File

@@ -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