less insane includes

panzi · May 22, 2014 · a70c3e7 · a70c3e7
1 parent a0e5740
commit a70c3e7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/include/formatstring/format_traits.h b/include/formatstring/format_traits.h
@@ -4,6 +4,7 @@
 
 #include "formatstring/config.h"
 #include "formatstring/formatter.h"
+#include "formatstring/format_traits_fwd.h"
 
 #include <type_traits>
 
@@ -13,9 +14,6 @@ namespace formatstring {
     using if_derived = typename std::enable_if<std::is_base_of<Base, Derived>::value>::type;
 
     // ---- fallback ----
-    template<typename Char, typename T, typename ENABLE = void>
-    struct format_traits;
-
     template<typename Char, typename T, typename ENABLE>
     struct format_traits {
         typedef Char char_type;

diff --git a/include/formatstring/format_traits_fwd.h b/include/formatstring/format_traits_fwd.h
@@ -0,0 +1,12 @@
+#ifndef FORMATSTRING_FORMAT_TRAITS_FWD_H
+#define FORMATSTRING_FORMAT_TRAITS_FWD_H
+#pragma once
+
+namespace formatstring {
+
+    template<typename Char, typename T, typename ENABLE = void>
+    struct format_traits;
+
+}
+
+#endif // FORMATSTRING_FORMAT_TRAITS_FWD_H
diff --git a/include/formatstring/formattedvalue.h b/include/formatstring/formattedvalue.h
@@ -8,6 +8,7 @@
 #include "formatstring/formatter.h"
 #include "formatstring/formatspec.h"
 #include "formatstring/formatvalue.h"
+#include "formatstring/format_traits.h"
 
 #include <sstream>
 

diff --git a/include/formatstring/formatter.h b/include/formatstring/formatter.h
@@ -18,6 +18,7 @@
 #include "formatstring/formatvalue.h"
 #include "formatstring/conversion.h"
 #include "formatstring/formatspec.h"
+#include "formatstring/format_traits_fwd.h"
 
 namespace formatstring {
 
@@ -49,6 +50,17 @@ namespace formatstring {
     template<typename Char, typename Last>
     inline void unpack_formatters(BasicFormatters<Char>& formatters, const Last& last);
 
+    template<typename Char, typename First, typename... Rest>
+    inline void unpack_formatters(BasicFormatters<Char>& formatters, const First& first, const Rest&... rest) {
+        formatters.emplace_back(format_traits<Char,First>::make_formatter(first));
+        unpack_formatters<Char, Rest...>(formatters, rest...);
+    }
+
+    template<typename Char, typename Last>
+    inline void unpack_formatters(BasicFormatters<Char>& formatters, const Last& last) {
+        formatters.emplace_back(format_traits<Char,Last>::make_formatter(last));
+    }
+
     template<typename Char, typename T,
              void _format(std::basic_ostream<Char>& out, T value, const BasicFormatSpec<Char>& spec) = format_value,
              void _repr(std::basic_ostream<Char>& out, T value) = repr_value>
@@ -136,19 +148,4 @@ namespace formatstring {
     }
 }
 
-// include is here because of circular dependency
-#include "formatstring/format_traits.h"
-
-// ==== unpack_formatters ====
-template<typename Char, typename First, typename... Rest>
-inline void formatstring::unpack_formatters(BasicFormatters<Char>& formatters, const First& first, const Rest&... rest) {
-    formatters.emplace_back(format_traits<Char,First>::make_formatter(first));
-    unpack_formatters<Char, Rest...>(formatters, rest...);
-}
-
-template<typename Char, typename Last>
-inline void formatstring::unpack_formatters(BasicFormatters<Char>& formatters, const Last& last) {
-    formatters.emplace_back(format_traits<Char,Last>::make_formatter(last));
-}
-
 #endif // FORMATSTRING_FORMATTER_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -25,6 +25,7 @@ add_library(${FORMATSTRING_NAME} SHARED
 	../include/formatstring/formatitem.h
 	../include/formatstring/formatspec.h
 	../include/formatstring/formatter.h
+	../include/formatstring/format_traits_fwd.h
 	../include/formatstring/format_traits.h
 	../include/formatstring/formattedvalue.h
 	../include/formatstring/formatvalue.h