diff options
| author |  Andrew Harp <andrewharp@google.com> | 2016-12-08 20:05:49 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2016-12-08 20:21:45 -0800 |
| commit | 1cb96893a64f59b7265f9def9968f7bed1e57662 (patch) | |
| tree | 0e6d595a0806028f5f92e64c84342ae9659ca108 /tensorflow/core/lib/strings/strcat_test.cc | |
| parent | 90b72f4b2f07a0126efb110d8d4cc96386fcc968 (diff) | |
Merge changes from github.
Additionally:
- change single quotes to double quotes to make path rewriting easier
- guard windows lib reference with PLATFORM_WINDOWS
- fixed failing kmeans test
Change: 141515942
Diffstat (limited to 'tensorflow/core/lib/strings/strcat_test.cc')
| -rw-r--r-- | tensorflow/core/lib/strings/strcat_test.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tensorflow/core/lib/strings/strcat_test.cc b/tensorflow/core/lib/strings/strcat_test.cc index 25561f1bd1..c556b1f676 100644 --- a/tensorflow/core/lib/strings/strcat_test.cc +++ b/tensorflow/core/lib/strings/strcat_test.cc @@ -22,6 +22,11 @@ limitations under the License. #include "tensorflow/core/platform/test.h" #include "tensorflow/core/platform/types.h" +#ifdef _MSC_VER +// ssize_t is not a standard C++ type. +typedef ptrdiff_t ssize_t; +#endif + namespace tensorflow { namespace strings { |