diff options
author | Piotr Padlewski <prazek@google.com> | 2018-09-07 16:55:59 -0700 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-09-07 17:04:56 -0700 |
commit | 74f8303d59bcceb8f81e407eb92fac70662c4697 (patch) | |
tree | fc7e22131a0342ca335b6a936427d812ceb44d7c /tensorflow/core/framework | |
parent | 448c807323361d446a409a5991acdfdc3337cf41 (diff) |
Fixed small nits in WhitelistedStatefulOpRegistry
StringPiece has been changed to string to avoid static order destruction fiasco (we store pointers that might have shorter lifetime) and also to use unordered_set (there is hash specialization for StringPiece).
PiperOrigin-RevId: 212059185
Diffstat (limited to 'tensorflow/core/framework')
-rw-r--r-- | tensorflow/core/framework/dataset_stateful_op_whitelist.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tensorflow/core/framework/dataset_stateful_op_whitelist.h b/tensorflow/core/framework/dataset_stateful_op_whitelist.h index 21c21723d0..74bd39cb61 100644 --- a/tensorflow/core/framework/dataset_stateful_op_whitelist.h +++ b/tensorflow/core/framework/dataset_stateful_op_whitelist.h @@ -16,6 +16,7 @@ limitations under the License. #ifndef TENSORFLOW_CORE_FRAMEWORK_DATASET_STATEFUL_OP_WHITELIST_H_ #define TENSORFLOW_CORE_FRAMEWORK_DATASET_STATEFUL_OP_WHITELIST_H_ +#include <unordered_set> #include "tensorflow/core/lib/core/status.h" namespace tensorflow { @@ -24,27 +25,26 @@ namespace data { // See below macro for usage details. class WhitelistedStatefulOpRegistry { public: - Status Add(StringPiece op_name) { - op_names_.insert(op_name); + Status Add(string op_name) { + op_names_.insert(std::move(op_name)); return Status::OK(); } - bool Contains(StringPiece op_name) { - return op_names_.find(op_name) != op_names_.end(); - } + bool Contains(const string& op_name) { return op_names_.count(op_name); } static WhitelistedStatefulOpRegistry* Global() { - static WhitelistedStatefulOpRegistry* reg = - new WhitelistedStatefulOpRegistry; + static auto* reg = new WhitelistedStatefulOpRegistry; return reg; } private: - WhitelistedStatefulOpRegistry() {} - WhitelistedStatefulOpRegistry(WhitelistedStatefulOpRegistry const& copy); + WhitelistedStatefulOpRegistry() = default; + WhitelistedStatefulOpRegistry(WhitelistedStatefulOpRegistry const& copy) = + delete; WhitelistedStatefulOpRegistry operator=( - WhitelistedStatefulOpRegistry const& copy); - std::set<StringPiece> op_names_; + WhitelistedStatefulOpRegistry const& copy) = delete; + + std::unordered_set<string> op_names_; }; } // namespace data |