From 9599b473035fb9f38959608f32180e22216c7dbc Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Fri, 24 Aug 2018 19:12:41 -0700 Subject: [PATCH] Make registration macro namespace-agnostic PiperOrigin-RevId: 210192298 --- .../core/common_runtime/optimization_registry.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tensorflow/core/common_runtime/optimization_registry.h b/tensorflow/core/common_runtime/optimization_registry.h index f5d265aa24b..6fcd2afd275 100644 --- a/tensorflow/core/common_runtime/optimization_registry.h +++ b/tensorflow/core/common_runtime/optimization_registry.h @@ -132,11 +132,12 @@ class OptimizationPassRegistration { #define REGISTER_OPTIMIZATION_UNIQ_HELPER(ctr, grouping, phase, optimization) \ REGISTER_OPTIMIZATION_UNIQ(ctr, grouping, phase, optimization) -#define REGISTER_OPTIMIZATION_UNIQ(ctr, grouping, phase, optimization) \ - static optimization_registration::OptimizationPassRegistration \ - register_optimization_##ctr( \ - grouping, phase, \ - std::unique_ptr(new optimization()), \ +#define REGISTER_OPTIMIZATION_UNIQ(ctr, grouping, phase, optimization) \ + static ::tensorflow::optimization_registration::OptimizationPassRegistration \ + register_optimization_##ctr( \ + grouping, phase, \ + ::std::unique_ptr<::tensorflow::GraphOptimizationPass>( \ + new optimization()), \ #optimization) } // namespace tensorflow