Added 'logging' import to control_flow_ops which is used in the file but not imported.

Change: 110842260

1 files changed, 4 insertions, 21 deletions

diff --git a/tensorflow/core/lib/strings/str_util.h b/tensorflow/core/lib/strings/str_util.h
index cd972e2371..134a49e631 100644
--- a/tensorflow/core/lib/strings/str_util.h
+++ b/tensorflow/core/lib/strings/str_util.h
@@ -81,9 +81,7 @@ void TitlecaseString(string* s, StringPiece delimiters);
 
 // Join functionality
 template <typename T>
-string Join(const std::vector<T>& s, const char* sep);
-template <typename T>
-string Join(const gtl::ArraySlice<T>& s, const char* sep);
+string Join(const T& s, const char* sep);
 
 struct AllowEmpty {
   bool operator()(StringPiece sp) const { return true; }
@@ -110,31 +108,16 @@ bool SplitAndParseAsInts(StringPiece text, char delim,
 
 // ------------------------------------------------------------------
 // Implementation details below
-namespace internal {
 template <typename T>
-string JoinHelper(typename gtl::ArraySlice<T>::const_iterator begin,
-                  typename gtl::ArraySlice<T>::const_iterator end,
-                  const char* sep) {
+string Join(const T& s, const char* sep) {
   string result;
   bool first = true;
-  for (typename gtl::ArraySlice<T>::const_iterator it = begin; it != end;
-       ++it) {
-    tensorflow::strings::StrAppend(&result, (first ? "" : sep), *it);
+  for (const auto& x : s) {
+    tensorflow::strings::StrAppend(&result, (first ? "" : sep), x);
     first = false;
   }
   return result;
 }
-}  // namespace internal
-
-template <typename T>
-string Join(const std::vector<T>& s, const char* sep) {
-  return Join<T>(gtl::ArraySlice<T>(s), sep);
-}
-
-template <typename T>
-string Join(const gtl::ArraySlice<T>& s, const char* sep) {
-  return internal::JoinHelper<T>(s.begin(), s.end(), sep);
-}
 
 inline std::vector<string> Split(StringPiece text, char delim) {
   return Split(text, delim, AllowEmpty());