diff --git a/thrift/compiler/lib/const_util.h b/thrift/compiler/generate/const_util.h similarity index 98% rename from thrift/compiler/lib/const_util.h rename to thrift/compiler/generate/const_util.h index 37554c71de9..de88e348d81 100644 --- a/thrift/compiler/lib/const_util.h +++ b/thrift/compiler/generate/const_util.h @@ -129,12 +129,12 @@ folly::void_t().toThrift())> hydrate_const( T& out, const t_const_value& val) { hydrate_const(out.toThrift(), val); } -void hydrate_const(protocol::Value& out, const t_const_value& val) { +inline void hydrate_const(protocol::Value& out, const t_const_value& val) { typename protocol::Value::__fbthrift_cpp2_type inner; hydrate_const(inner, val); out = protocol::Value(std::move(inner)); } -void hydrate_const(protocol::Object& out, const t_const_value& val) { +inline void hydrate_const(protocol::Object& out, const t_const_value& val) { typename protocol::Object::__fbthrift_cpp2_type inner; hydrate_const(inner, val); out = protocol::Object(std::move(inner)); diff --git a/thrift/compiler/generate/t_ast_generator.cc b/thrift/compiler/generate/t_ast_generator.cc index f68295e1326..c59a98730e0 100644 --- a/thrift/compiler/generate/t_ast_generator.cc +++ b/thrift/compiler/generate/t_ast_generator.cc @@ -25,8 +25,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/thrift/compiler/test/const_util_test.cc b/thrift/compiler/test/const_util_test.cc index 7bc432c2cfd..9e5a38968a6 100644 --- a/thrift/compiler/test/const_util_test.cc +++ b/thrift/compiler/test/const_util_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include