Some minor fixes

Author: mgreter

src/ast.hpp

@@ -567,7 +567,7 @@ namespace Sass {
     bool empty() const { return elements_.empty(); }
 
     bool has(K k) const          {
-      return elements_.count(k);
+      return elements_.count(k) == 1;
     }
 
     void reserve(size_t size)

src/file.cpp

@@ -16,6 +16,7 @@
 #include <cstdio>
 #include <vector>
 #include <algorithm>
+#include <unordered_map>
 #include <sys/stat.h>
 #include "file.hpp"
 #include "context.hpp"

src/memory_pool.hpp

@@ -10,7 +10,7 @@
 namespace Sass {
 
   // Move this to somewhere else, should be global
-  constexpr size_t SASS_MEM_ALIGN = sizeof(unsigned int);
+	#define SASS_MEM_ALIGN sizeof(unsigned int)
 
   inline static size_t align2(size_t n) {
     return (n + SASS_MEM_ALIGN - 1) & ~(SASS_MEM_ALIGN - 1);
@@ -54,25 +54,25 @@ namespace Sass {
 
 
   // The size of the memory pool arenas in bytes.
-  constexpr static size_t SassAllocatorArenaSize = 1024 * 256;
+  #define SassAllocatorArenaSize (1024 * 256)
 
   // How many buckets should we have for the freelist
   // Determines when allocations go directly to malloc/free
   // For maximum size of managed items multiply by alignment
-  constexpr static size_t SassAllocatorBuckets = 512;
+#define SassAllocatorBuckets 512
 
   // The alignment for the memory fragments. Must be a multiple
   // of `SASS_MEM_ALIGN` and should not be too big (maybe 1 or 2)
-  constexpr static size_t SassAllocatorAlignment = SASS_MEM_ALIGN * 2;
+#define SassAllocatorAlignment (SASS_MEM_ALIGN * 2)
 
   // The number of bytes we use for our book-keeping before every
   // memory fragment. Needed to know to which bucket we belongs on
   // deallocations, or if it should go directly to the `free` call.
-  constexpr size_t SassAllocatorBookSize = sizeof(unsigned int);
+#define SassAllocatorBookSize sizeof(unsigned int)
 
   // Bytes reserve for book-keeping on the arenas
   // Currently unused and for later optimization
-  constexpr size_t SassAllocatorArenaHeadSize = 0;
+#define SassAllocatorArenaHeadSize 0
 
   class MemoryPool {
 

src/ordered-map/ordered_hash.h

@@ -128,8 +128,8 @@ static T numeric_cast(U value, const char* error_message = "numeric_cast() faile
  * to represent a std::size_t on 32 and 64 bits platforms, and must be the same size on both platforms.
  */
 using slz_size_type = std::uint64_t;
-static_assert(std::numeric_limits<slz_size_type>::max() >= std::numeric_limits<std::size_t>::max(),
-              "slz_size_type must be >= std::size_t");
+// static_assert(std::numeric_limits<slz_size_type>::max() >= std::numeric_limits<std::size_t>::max(),
+//               "slz_size_type must be >= std::size_t");
 
 template<class T, class Deserializer>
 static T deserialize_value(Deserializer& deserializer) {