feat(dict): no conditional compilation on arm

rime · Oct 4, 2017 · 85b945f · 85b945f
1 parent 1177142
commit 85b945f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/src/rime/dict/mapped_file.h b/src/rime/dict/mapped_file.h
@@ -131,11 +131,7 @@ class MappedFile : boost::noncopyable {
 
 // member function definitions
 
-# if defined(__arm__)
 # define RIME_ALIGNED(size, T) ((size + alignof(T) - 1) & ~(alignof(T) - 1))
-# else
-# define RIME_ALIGNED(size, T) (size)
-# endif
 
 template <class T>
 T* MappedFile::Allocate(size_t count) {

diff --git a/src/rime/dict/table.h b/src/rime/dict/table.h
@@ -15,13 +15,13 @@
 #include <rime/dict/vocabulary.h>
 #include <rime/dict/string_table.h>
 
-#define RIME_TABLE_UNION(U, V, Ta, a, Tb, b) \
+#define RIME_TABLE_UNION(U, V, A, a, B, b) \
     struct U { \
       V value; \
-      const Ta& a() const { return *reinterpret_cast<const Ta*>(this); } \
-      const Tb& b() const { return *reinterpret_cast<const Tb*>(this); } \
-      Ta& a() { return *reinterpret_cast<Ta*>(this); } \
-      Tb& b() { return *reinterpret_cast<Tb*>(this); } \
+      const A& a() const { return *reinterpret_cast<const A*>(this); } \
+      const B& b() const { return *reinterpret_cast<const B*>(this); } \
+      A& a() { return *reinterpret_cast<A*>(this); } \
+      B& b() { return *reinterpret_cast<B*>(this); } \
     }
 
 namespace rime {
@@ -40,11 +40,7 @@ using Syllabary = Array<StringType>;
 
 using Code = List<SyllableId>;
 
-#if defined(__arm__)
 using Weight = double;
-#else
-using Weight = float;
-#endif
 
 struct Entry {
   StringType text;
@@ -75,7 +71,7 @@ using TrunkIndex = Array<TrunkIndexNode>;
 
 using TailIndex = Array<LongEntry>;
 
-//union Phraseindex {
+//union PhraseIndex {
 //  TrunkIndex trunk;
 //  TailIndex tail;
 //};