razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #521 from janisozaur/aligner-type

Browse source 
Rename aligner_type redefinitions
This commit is contained in:
Shinya Kitaoka 2016-06-29 18:55:30 +09:00 committed by GitHub
commit 00c547d5c1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toonz/sources/include/tcg/alignment.h
View file

@ -79,14 +79,14 @@ private:
template <typename T>
union aligned_buffer {
typedef aligner_type<sizeof(_Aligner<T>) - sizeof(T)> aligner_type;
typedef aligner_type<sizeof(_Aligner<T>) - sizeof(T)> aligner_type_t;
aligner_type m_aligner;
aligner_type_t m_aligner;
char m_buf[sizeof(T)];
private:
TCG_STATIC_ASSERT(sizeof(_Aligner<T>) - sizeof(T) ==
sizeof(_Aligner<aligner_type>) - sizeof(aligner_type));
sizeof(_Aligner<aligner_type_t>) - sizeof(aligner_type_t));
};
//**************************************************************************
@ -97,7 +97,7 @@ template <typename T>
struct alignment_traits {
static const int alignment = sizeof(_Aligner<T>) - sizeof(T);
typedef aligner_type<alignment> aligner_type;
typedef aligner_type<alignment> aligner_type_traits;
typedef aligned_buffer<T> buffer_type;
};