From 71817a06326b062ebd19990141933cb997ade45b Mon Sep 17 00:00:00 2001 From: Chen Gong Date: Tue, 19 Sep 2017 00:21:24 +0800 Subject: [PATCH] fix(config_compiler): template operator overload had compile error with NDK --- src/rime/config/config_compiler.h | 5 +++++ src/rime/config/config_compiler_impl.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/rime/config/config_compiler.h b/src/rime/config/config_compiler.h index 2de4dd4245..26b1595eaf 100644 --- a/src/rime/config/config_compiler.h +++ b/src/rime/config/config_compiler.h @@ -35,6 +35,11 @@ struct Reference { string repr() const; }; +template +StreamT& operator<< (StreamT& stream, const Reference& reference) { + return stream << reference.repr(); +} + class ConfigCompilerPlugin; class ResourceResolver; struct Dependency; diff --git a/src/rime/config/config_compiler_impl.h b/src/rime/config/config_compiler_impl.h index cde33a7bda..00c1df7eef 100644 --- a/src/rime/config/config_compiler_impl.h +++ b/src/rime/config/config_compiler_impl.h @@ -32,9 +32,9 @@ struct Dependency { virtual bool Resolve(ConfigCompiler* compiler) = 0; }; -template -StreamT& operator<< (StreamT& stream, const RepresentableT& representable) { - return stream << representable.repr(); +template +StreamT& operator<< (StreamT& stream, const Dependency& dependency) { + return stream << dependency.repr(); } struct PendingChild : Dependency {