diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2018-04-04 12:08:49 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-04-04 12:11:49 -0700 |
| commit | 13e103b8f0dcc89673dd0d3d589b976c05c37a09 (patch) | |
| tree | 3debee5abeae72842052b360124504c5a62e9779 /tensorflow/core/util/command_line_flags.cc | |
| parent | bd540c8c45bf66a9c14af38a272840b47731b91a (diff) | |
Replaced calls to deprecated tensorflow::StringPiece methods with their
tensorflow::str_util equivalents.
This will allow the deprecated methods to be removed.
PiperOrigin-RevId: 191627087
Diffstat (limited to 'tensorflow/core/util/command_line_flags.cc')
| -rw-r--r-- | tensorflow/core/util/command_line_flags.cc | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/tensorflow/core/util/command_line_flags.cc b/tensorflow/core/util/command_line_flags.cc index 3efc703faf..480ce94fca 100644 --- a/tensorflow/core/util/command_line_flags.cc +++ b/tensorflow/core/util/command_line_flags.cc @@ -17,6 +17,7 @@ limitations under the License. #include <vector> #include "tensorflow/core/lib/core/stringpiece.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/lib/strings/stringprintf.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/util/command_line_flags.h" @@ -28,7 +29,9 @@ bool ParseStringFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(string)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag) && + str_util::ConsumePrefix(&arg, "=")) { *value_parsing_ok = hook(arg.ToString()); return true; } @@ -40,7 +43,9 @@ bool ParseInt32Flag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(int32)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag) && + str_util::ConsumePrefix(&arg, "=")) { char extra; int32 parsed_int32; if (sscanf(arg.data(), "%d%c", &parsed_int32, &extra) != 1) { @@ -60,7 +65,9 @@ bool ParseInt64Flag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(int64)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag) && + str_util::ConsumePrefix(&arg, "=")) { char extra; int64 parsed_int64; if (sscanf(arg.data(), "%lld%c", &parsed_int64, &extra) != 1) { @@ -80,7 +87,8 @@ bool ParseBoolFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(bool)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag)) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag)) { if (arg.empty()) { *value_parsing_ok = hook(true); return true; @@ -107,7 +115,9 @@ bool ParseFloatFlag(tensorflow::StringPiece arg, tensorflow::StringPiece flag, const std::function<bool(float)>& hook, bool* value_parsing_ok) { *value_parsing_ok = true; - if (arg.Consume("--") && arg.Consume(flag) && arg.Consume("=")) { + if (str_util::ConsumePrefix(&arg, "--") && + str_util::ConsumePrefix(&arg, flag) && + str_util::ConsumePrefix(&arg, "=")) { char extra; float parsed_float; if (sscanf(arg.data(), "%f%c", &parsed_float, &extra) != 1) { |