From ee9d899aa3f35b46e54f82331c099d62a2143aa6 Mon Sep 17 00:00:00 2001
From: Matthew Parkinson <mattpark@microsoft.com>
Date: Thu, 17 Jan 2019 14:38:14 +0000
Subject: [PATCH] Remove GRANULARITY check

This check was not doing anything.  It was from an earlier dependency
ordering issue that has now been fixed.
---
 src/mem/alloc.h   | 4 ----
 src/mem/pagemap.h | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/src/mem/alloc.h b/src/mem/alloc.h
index ab009e7..701ccf6 100644
--- a/src/mem/alloc.h
+++ b/src/mem/alloc.h
@@ -140,10 +140,6 @@ namespace snmalloc
     }
   };
 
-  static_assert(
-    SUPERSLAB_SIZE == SuperslabPagemap::GRANULARITY,
-    "The superslab size should be the same as the pagemap granularity");
-
 #ifndef SNMALLOC_DEFAULT_PAGEMAP
 #  define SNMALLOC_DEFAULT_PAGEMAP snmalloc::SuperslabMap
 #endif
diff --git a/src/mem/pagemap.h b/src/mem/pagemap.h
index b902199..b47bd93 100644
--- a/src/mem/pagemap.h
+++ b/src/mem/pagemap.h
@@ -189,8 +189,6 @@ namespace snmalloc
     }
 
   public:
-    static constexpr size_t GRANULARITY = 1 << GRANULARITY_BITS;
-
     T get(void* p)
     {
       bool success;
@@ -245,10 +243,6 @@ namespace snmalloc
     static constexpr size_t ENTRIES = 1ULL << (COVERED_BITS + CONTENT_BITS);
     static constexpr size_t SHIFT = GRANULARITY_BITS;
 
-  public:
-    static constexpr size_t GRANULARITY = 1 << GRANULARITY_BITS;
-
-  private:
     std::atomic<T> top[ENTRIES];
 
   public: