Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5

--HG--
extra : convert_revision : dd887635c7ce74324b3670744461ffdf92e1dedf

3 files changed, 17 insertions, 0 deletions

diff --git a/base/fast_alloc.cc b/base/fast_alloc.cc
index ff0a40c37..abb50aa0c 100644
--- a/base/fast_alloc.cc
+++ b/base/fast_alloc.cc
@@ -32,6 +32,8 @@
  * by permission.
  */
 
+#ifndef NO_FAST_ALLOC
+
 #ifdef __GNUC__
 #pragma implementation
 #endif
@@ -189,3 +191,5 @@ fast_alloc_oldest(int n)
 }
 
 #endif
+
+#endif // NO_FAST_ALLOC
diff --git a/base/fast_alloc.hh b/base/fast_alloc.hh
index 7d699abd1..81f2f1359 100644
--- a/base/fast_alloc.hh
+++ b/base/fast_alloc.hh
@@ -68,6 +68,13 @@
 // (by bucket).
 // #define FAST_ALLOC_STATS
 
+#ifdef NO_FAST_ALLOC
+
+class FastAlloc {
+};
+
+#else
+
 class FastAlloc {
   public:
 
@@ -200,4 +207,6 @@ void FastAlloc::operator delete(void *p, size_t sz)
     deallocate(p, sz);
 }
 
+#endif // NO_FAST_ALLOC
+
 #endif // __FAST_ALLOC_H__
diff --git a/base/statistics.hh b/base/statistics.hh
index 732d1766a..ed3278e4a 100644
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -1138,6 +1138,8 @@ class Vector2dBase : public DataAccess
   protected:
     typedef Storage<T> storage_t;
     typedef typename storage_t::Params params_t;
+
+  public:
     typedef typename Bin::VectorBin<storage_t> bin_t;
 
   protected:
@@ -1675,6 +1677,8 @@ class VectorDistBase : public DataAccess
   protected:
     typedef Storage<T> storage_t;
     typedef typename storage_t::Params params_t;
+
+  public:
     typedef typename Bin::VectorBin<storage_t> bin_t;
 
   protected: