diff options
Diffstat (limited to 'src/3rdparty/angle/src/compiler/translator/Common.h')
-rw-r--r-- | src/3rdparty/angle/src/compiler/translator/Common.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/Common.h b/src/3rdparty/angle/src/compiler/translator/Common.h index ac1aef0f4c..60223232af 100644 --- a/src/3rdparty/angle/src/compiler/translator/Common.h +++ b/src/3rdparty/angle/src/compiler/translator/Common.h @@ -14,9 +14,9 @@ #include <limits> #include <stdio.h> -#include "compiler/translator/PoolAlloc.h" -#include "compiler/translator/compilerdebug.h" #include "common/angleutils.h" +#include "common/debug.h" +#include "compiler/translator/PoolAlloc.h" struct TSourceLoc { int first_file; @@ -60,18 +60,21 @@ inline TString* NewPoolTString(const char* s) // // Pool allocator versions of vectors, lists, and maps // -template <class T> class TVector : public std::vector<T, pool_allocator<T> > { -public: - typedef typename std::vector<T, pool_allocator<T> >::size_type size_type; - TVector() : std::vector<T, pool_allocator<T> >() {} - TVector(const pool_allocator<T>& a) : std::vector<T, pool_allocator<T> >(a) {} - TVector(size_type i): std::vector<T, pool_allocator<T> >(i) {} +template <class T> +class TVector : public std::vector<T, pool_allocator<T>> +{ + public: + typedef typename std::vector<T, pool_allocator<T>>::size_type size_type; + TVector() : std::vector<T, pool_allocator<T>>() {} + TVector(const pool_allocator<T> &a) : std::vector<T, pool_allocator<T>>(a) {} + TVector(size_type i) : std::vector<T, pool_allocator<T>>(i) {} }; -template <class K, class D, class CMP = std::less<K> > -class TMap : public std::map<K, D, CMP, pool_allocator<std::pair<const K, D> > > { -public: - typedef pool_allocator<std::pair<const K, D> > tAllocator; +template <class K, class D, class CMP = std::less<K>> +class TMap : public std::map<K, D, CMP, pool_allocator<std::pair<const K, D>>> +{ + public: + typedef pool_allocator<std::pair<const K, D>> tAllocator; TMap() : std::map<K, D, CMP, tAllocator>() {} // use correct two-stage name lookup supported in gcc 3.4 and above |