fix(config_compiler): ambiguous operator overload with cmake option E…

…NABLE_LOGGING=OFF Fixes #211
rime · Jul 2, 2018 · b86b647 · b86b647
1 parent 122893d
commit b86b647
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/rime/config/config_compiler.cc b/src/rime/config/config_compiler.cc
@@ -9,6 +9,14 @@
 
 namespace rime {
 
+std::ostream& operator<< (std::ostream& stream, const Reference& reference) {
+  return stream << reference.repr();
+}
+
+std::ostream& operator<< (std::ostream& stream, const Dependency& dependency) {
+  return stream << dependency.repr();
+}
+
 struct ConfigDependencyGraph {
   map<string, of<ConfigResource>> resources;
   vector<of<ConfigItemRef>> node_stack;

diff --git a/src/rime/config/config_compiler.h b/src/rime/config/config_compiler.h
@@ -5,6 +5,7 @@
 #ifndef RIME_CONFIG_COMPILER_H_
 #define RIME_CONFIG_COMPILER_H_
 
+#include <ostream>
 #include <rime/common.h>
 #include <rime/config/config_data.h>
 #include <rime/config/config_types.h>
@@ -35,10 +36,7 @@ struct Reference {
   string repr() const;
 };
 
-template <class StreamT>
-StreamT& operator<< (StreamT& stream, const Reference& reference) {
-  return stream << reference.repr();
-}
+std::ostream& operator<< (std::ostream& stream, const Reference& reference);
 
 class ConfigCompilerPlugin;
 class ResourceResolver;

diff --git a/src/rime/config/config_compiler_impl.h b/src/rime/config/config_compiler_impl.h
@@ -5,6 +5,7 @@
 #ifndef RIME_CONFIG_COMPILER_IMPL_H_
 #define RIME_CONFIG_COMPILER_IMPL_H_
 
+#include <ostream>
 #include <rime/common.h>
 #include <rime/config/config_compiler.h>
 #include <rime/config/config_types.h>
@@ -32,10 +33,7 @@ struct Dependency {
   virtual bool Resolve(ConfigCompiler* compiler) = 0;
 };
 
-template <class StreamT>
-StreamT& operator<< (StreamT& stream, const Dependency& dependency) {
-  return stream << dependency.repr();
-}
+std::ostream& operator<< (std::ostream& stream, const Dependency& dependency);
 
 struct PendingChild : Dependency {
   string child_path;