Merge commit for internal changes

yeemaster · Jan 27, 2016 · 7b4fe0e · 7b4fe0e
2 parents 4eeb6d6 + e36590b
commit 7b4fe0e
Show file tree

Hide file tree

Showing 16 changed files with 986 additions and 735 deletions.
diff --git a/tensorflow/core/lib/gtl/array_slice.h b/tensorflow/core/lib/gtl/array_slice.h
@@ -137,7 +137,7 @@ class ArraySlice {
 
   template <int N>
   ArraySlice(const InlinedVector<value_type, N>& v)  // NOLINT(runtime/explicit)
-      : impl_(v.array(), v.size()) {}
+      : impl_(v.data(), v.size()) {}
 
   // The constructor for any class supplying 'data() const' that returns either
   // const T* or a less const-qualified version of it, and 'some_integral_type
@@ -247,7 +247,7 @@ class MutableArraySlice {
   template <int N>
   MutableArraySlice(
       InlinedVector<value_type, N>* v)  // NOLINT(runtime/explicit)
-      : impl_(v->mutable_array(), v->size()) {}
+      : impl_(v->data(), v->size()) {}
 
   // The constructor for any class supplying 'T* data()' or 'T* mutable_data()'
   // (the former is called if both exist), and 'some_integral_type size()

diff --git a/tensorflow/core/lib/gtl/array_slice_test.cc b/tensorflow/core/lib/gtl/array_slice_test.cc
@@ -528,7 +528,7 @@ TEST(MutableIntSlice, InlinedVectorConversion) {
     }
     MutableIntSlice v = &inline_vec;  // Test assignment
     static_cast<void>(v);
-    TestImplicitConversion(&inline_vec, inline_vec.array(), inline_vec.size());
+    TestImplicitConversion(&inline_vec, inline_vec.data(), inline_vec.size());
   }
 }