Move enum idt to the single translation unit that actually requires it

tautschnig · tautschnig · commit 38782bd0016d · 2018-04-25T15:08:35.000+01:00
diff --git a/src/util/irep_ids.cpp b/src/util/irep_ids.cpp
@@ -27,6 +27,14 @@ const char *irep_ids_table[]=
 
 #ifdef USE_DSTRING
 
+enum class idt:unsigned
+{
+#define IREP_ID_ONE(the_id) id_##the_id,
+#define IREP_ID_TWO(the_id, str) id_##the_id,
+
+#include "irep_ids.def" // NOLINT(build/include)
+};
+
 #define IREP_ID_ONE(the_id)                                                    \
   const dstringt ID_##the_id=dstringt::make_from_table_index(                  \
       static_cast<unsigned>(idt::id_##the_id));
diff --git a/src/util/irep_ids.h b/src/util/irep_ids.h
@@ -33,14 +33,6 @@ Author: Reuben Thomas, reuben.thomas@me.com
 /// into a const extern irep_idt with the variable name `ID_param` and the
 /// string value `"contents"`.
 
-enum class idt:unsigned
-{
-#define IREP_ID_ONE(the_id) id_##the_id,
-#define IREP_ID_TWO(the_id, str) id_##the_id,
-
-#include "irep_ids.def"
-};
-
 #ifdef USE_DSTRING
 
 #define IREP_ID_ONE(the_id) extern const dstringt ID_##the_id;
@@ -53,6 +45,6 @@ enum class idt:unsigned
 
 #endif
 
-#include "irep_ids.def" // NOLINT(build/include)
+#include "irep_ids.def"
 
 #endif
