From 5387bee4bd0ba8413aeddf68468b64638084b399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Thu, 23 Jun 2016 19:35:59 +0200
Subject: [PATCH] Rename aligner_type redefinitions

---
 toonz/sources/include/tcg/alignment.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/toonz/sources/include/tcg/alignment.h b/toonz/sources/include/tcg/alignment.h
index 235c5942..8941f02e 100644
--- a/toonz/sources/include/tcg/alignment.h
+++ b/toonz/sources/include/tcg/alignment.h
@@ -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;
 };