]>
Commit | Line | Data |
---|---|---|
63c94c51 MT |
1 | diff --git a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h |
2 | index 59ff6aa..1325394 100644 | |
3 | --- a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h | |
4 | +++ b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h | |
5 | @@ -169,3 +169,3 @@ public: | |
6 | KeyLength+1; | |
7 | - unsigned Alignment = alignof<StringMapEntry>(); | |
8 | + unsigned Alignment = alignOf<StringMapEntry>(); | |
9 | ||
10 | diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h | |
11 | index 88044c7..86b0f40 100644 | |
12 | --- a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h | |
13 | +++ b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h | |
14 | @@ -417,3 +417,3 @@ namespace llvm { | |
15 | ileAllocator.Allocate(sizeof(IndexListEntry), | |
16 | - alignof<IndexListEntry>())); | |
17 | + alignOf<IndexListEntry>())); | |
18 | ||
19 | diff --git a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h | |
20 | index 6a7a1a6..979e597 100644 | |
21 | --- a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h | |
22 | +++ b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h | |
23 | @@ -51,8 +51,8 @@ struct AlignOf { | |
24 | ||
25 | -/// alignof - A templated function that returns the mininum alignment of | |
26 | +/// alignOf - A templated function that returns the mininum alignment of | |
27 | /// of a type. This provides no extra functionality beyond the AlignOf | |
28 | /// class besides some cosmetic cleanliness. Example usage: | |
29 | -/// alignof<int>() returns the alignment of an int. | |
30 | +/// alignOf<int>() returns the alignment of an int. | |
31 | template <typename T> | |
32 | -static inline unsigned alignof() { return AlignOf<T>::Alignment; } | |
33 | +static inline unsigned alignOf() { return AlignOf<T>::Alignment; } | |
34 | ||
35 | diff --git a/libclamav/c++/llvm/include/llvm/Support/Allocator.h b/libclamav/c++/llvm/include/llvm/Support/Allocator.h | |
36 | index 4a7251f..17caf5e 100644 | |
37 | --- a/libclamav/c++/llvm/include/llvm/Support/Allocator.h | |
38 | +++ b/libclamav/c++/llvm/include/llvm/Support/Allocator.h | |
39 | @@ -203,3 +203,3 @@ public: | |
40 | for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) { | |
41 | - Ptr = Allocator.AlignPtr(Ptr, alignof<T>()); | |
42 | + Ptr = Allocator.AlignPtr(Ptr, alignOf<T>()); | |
43 | if (Ptr + sizeof(T) <= End) | |
44 | diff --git a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp | |
45 | index b892d85..dc72346 100644 | |
46 | --- a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp | |
47 | +++ b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp | |
48 | @@ -495,3 +495,3 @@ void SCEVUnknown::print(raw_ostream &OS) const { | |
49 | if (isAlignOf(AllocTy)) { | |
50 | - OS << "alignof(" << *AllocTy << ")"; | |
51 | + OS << "alignOf(" << *AllocTy << ")"; | |
52 | return; | |
53 | diff --git a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp | |
54 | index 824021c..757ca50 100644 | |
55 | --- a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp | |
56 | +++ b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp | |
57 | @@ -569,3 +569,3 @@ void Emitter<CodeEmitter>::emitMemModRMByte(const MachineInstr &MI, | |
58 | // Calculate what the SS field value should be... | |
59 | - static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 }; | |
60 | + static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u }; | |
61 | unsigned SS = SSTable[Scale.getImm()]; | |
62 | diff --git a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp | |
63 | index 9564fe0..b2b7986 100644 | |
64 | --- a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp | |
65 | +++ b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp | |
66 | @@ -332,3 +332,3 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op, | |
67 | // Calculate what the SS field value should be... | |
68 | - static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 }; | |
69 | + static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u }; | |
70 | unsigned SS = SSTable[Scale.getImm()]; | |
71 | diff --git a/libclamav/mpool.c b/libclamav/mpool.c | |
72 | index cd38e15..b5e537d 100644 | |
73 | --- a/libclamav/mpool.c | |
74 | +++ b/libclamav/mpool.c | |
75 | @@ -417,3 +417,3 @@ static size_t from_bits(unsigned int bits) { | |
76 | ||
77 | -static inline unsigned int alignof(size_t size) | |
78 | +static inline unsigned int alignOf(size_t size) | |
79 | { | |
80 | @@ -609,3 +609,3 @@ static void* allocate_aligned(struct MPMAP *mpm, size_t size, unsigned align, co | |
81 | void *mpool_malloc(struct MP *mp, size_t size) { | |
82 | - size_t align = alignof(size); | |
83 | + size_t align = alignOf(size); | |
84 | size_t i, needed = align_increase(size+FRAG_OVERHEAD, align); |