diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 09:43:40 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 09:44:01 +0200 |
commit | 046dc22ce15d363ee28d8ad1710c16e76e75a139 (patch) | |
tree | b4bbf9bb50f683ffa2fb9796f4c5b78c877cd5cc /sc/inc/stlalgorithm.hxx | |
parent | ec533b46ef174037e6cfadceb5fb38cbe805e2d2 (diff) |
Avoid reserved identifiers
Change-Id: I782784f34975d708fdf179d098ce6654aad7a976
Diffstat (limited to 'sc/inc/stlalgorithm.hxx')
-rw-r--r-- | sc/inc/stlalgorithm.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx index 7cc5eebafece..678f30676c9c 100644 --- a/sc/inc/stlalgorithm.hxx +++ b/sc/inc/stlalgorithm.hxx @@ -21,7 +21,7 @@ namespace sc { * Custom allocator for STL container to ensure that the base address of * allocated storage is aligned to a specified boundary. */ -template<typename T, size_t _Alignment> +template<typename T, size_t Alignment> class AlignedAllocator { public: @@ -36,17 +36,17 @@ public: typedef T& reference; typedef const T& const_reference; - template<typename _Type2> + template<typename Type2> struct rebind { - typedef AlignedAllocator<_Type2,_Alignment> other; + typedef AlignedAllocator<Type2,Alignment> other; }; AlignedAllocator() {} ~AlignedAllocator() {} - template<typename _Type2> - AlignedAllocator(const AlignedAllocator<_Type2,_Alignment>&) {} + template<typename Type2> + AlignedAllocator(const AlignedAllocator<Type2,Alignment>&) {} static void construct(T* p, const value_type& val) { new(p) value_type(val); } static void destroy(T* p) @@ -65,7 +65,7 @@ public: static pointer allocate(size_type n) { - return static_cast<pointer>(rtl_allocateAlignedMemory(_Alignment, n*sizeof(value_type))); + return static_cast<pointer>(rtl_allocateAlignedMemory(Alignment, n*sizeof(value_type))); } static void deallocate(pointer p, size_type) |