diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 7 | ||||
-rw-r--r-- | src/include/storage.H | 6 | ||||
-rw-r--r-- | src/utils/hash-table.H | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c0c25a74..5e1f75ba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2013-11-26 Gabriel Dos Reis <gdr@integrable-solutions.net> + + * include/storage.H (Arena<T>::allocate): Adjust spelling of + alignment query operator. + (Arena<T>::Arena): Likewise. + (HashTableEntry<T>): Adjust spelling of alignment specifier. + 2013-11-03 Gabriel Dos Reis <gdr@integrable-solutions.net> * include/Charset.H (OpenAxiom): New. diff --git a/src/include/storage.H b/src/include/storage.H index afd5f51f..e414dec2 100644 --- a/src/include/storage.H +++ b/src/include/storage.H @@ -229,8 +229,7 @@ namespace OpenAxiom { if (BlockStorage::room(store) < sz) { // Not enough room left. Make sure we allocate storage // at least as big as the current. - Handle* h = acquire(std::max(n, object_count(store)), - openaxiom_alignment(T)); + Handle* h = acquire(std::max(n, object_count(store)), alignof(T)); previous(h) = store; store = h; } @@ -239,8 +238,7 @@ namespace OpenAxiom { template<typename T> Arena<T>::Arena(size_t n) - : store(BlockStorage::acquire(n * sizeof (T), - openaxiom_alignment (T))) + : store(BlockStorage::acquire(n * sizeof (T), alignof (T))) { } template<typename T> diff --git a/src/utils/hash-table.H b/src/utils/hash-table.H index 6d9da3d7..d74c7760 100644 --- a/src/utils/hash-table.H +++ b/src/utils/hash-table.H @@ -49,7 +49,7 @@ namespace OpenAxiom { // so that an instance of it can be used directly as a VM value. // See <open-axiom/vm> for more description. template<typename T> - struct openaxiom_alignas(8) HashTableEntry : T { + struct alignas(8) HashTableEntry : T { HashTableEntry* chain; // previous item in the same bucket chain size_t hash; // hash code of stored data }; |