Make small map and share keys options changeable independent of default value

Author: danpoe

src/util/sharing_node.h

@@ -21,11 +21,15 @@ Author: Daniel Poetzl
 #include <forward_list>
 #include <type_traits>
 
-//#define _SN_SHARE_KEYS
+#ifndef _SN_SMALL_MAP
+#define _SN_SMALL_MAP 1
+#endif
 
-//#define _SN_SMALL_MAP
+#ifndef _SN_SHARE_KEYS
+#define _SN_SHARE_KEYS 0
+#endif
 
-#ifdef _SN_SMALL_MAP
+#if _SN_SMALL_MAP == 1
 #include "small_map.h"
 #else
 #include <map>
@@ -77,7 +81,7 @@ _sn_type_par_decl class d_internalt : public d_baset
 {
 public:
   typedef sharing_node_innert<_sn_type_args> innert;
-#ifdef _SN_SMALL_MAP
+#if _SN_SMALL_MAP == 1
   typedef small_mapt<innert> to_mapt;
 #else
   typedef std::map<std::size_t, innert> to_mapt;
@@ -412,7 +416,7 @@ small_shared_ptrt<dataT>
 _sn_type_par_decl class d_leaft : public small_shared_pointeet<unsigned>
 {
 public:
-#ifdef _SN_SHARE_KEYS
+#if _SN_SHARE_KEYS == 1
   std::shared_ptr<keyT> k;
 #else
   keyT k;
@@ -437,7 +441,7 @@ _sn_type_par_def class sharing_node_leaft
     auto &d = write();
 
 // Copy key
-#ifdef _SN_SHARE_KEYS
+#if _SN_SHARE_KEYS == 1
     _sn_assert(d.k == nullptr);
     d.k = std::make_shared<keyT>(k);
 #else
@@ -452,7 +456,7 @@ _sn_type_par_def class sharing_node_leaft
   {
     _sn_assert(!empty());
 
-#ifdef _SN_SHARE_KEYS
+#if _SN_SHARE_KEYS == 1
     return *read().k;
 #else
     return read().k;