diff options
author | Chris Lattner <sabre@nondot.org> | 2010-10-30 05:14:01 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-10-30 05:14:01 +0000 |
commit | 16c3b647eb100fe404ee65f106d563ddef6c74b7 (patch) | |
tree | 14f84f8de4f8628bcbce11171bab3d89c8237cae /include/llvm/ADT/StringMap.h | |
parent | 9a82e7027549bfc8655b090b37e709baa3cd3240 (diff) | |
download | external_llvm-16c3b647eb100fe404ee65f106d563ddef6c74b7.tar.gz external_llvm-16c3b647eb100fe404ee65f106d563ddef6c74b7.tar.bz2 external_llvm-16c3b647eb100fe404ee65f106d563ddef6c74b7.zip |
Rename alignof -> alignOf to avoid irritating C++'0x compilers,
PR8423, patch by nobled.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117774 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/ADT/StringMap.h')
-rw-r--r-- | include/llvm/ADT/StringMap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h index 4d8dd64b0b..d047a42079 100644 --- a/include/llvm/ADT/StringMap.h +++ b/include/llvm/ADT/StringMap.h @@ -167,7 +167,7 @@ public: unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+ KeyLength+1; - unsigned Alignment = alignof<StringMapEntry>(); + unsigned Alignment = alignOf<StringMapEntry>(); StringMapEntry *NewItem = static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment)); |