Merge branch 'master' into async-support

microsoft · Dec 3, 2019 · 6b03887 · 6b03887
2 parents a1b87a5 + e3bd096
commit 6b03887
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/cc/CMakeLists.txt.in b/cc/CMakeLists.txt.in
@@ -7,7 +7,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
-  GIT_TAG           release-1.8.1
+  GIT_TAG           master
   SOURCE_DIR        "${CMAKE_BINARY_DIR}/googletest-src"
   BINARY_DIR        "${CMAKE_BINARY_DIR}/googletest-build"
   CONFIGURE_COMMAND ""

diff --git a/cc/src/core/faster.h b/cc/src/core/faster.h
@@ -2868,5 +2868,18 @@ bool FasterKv<K, V, D>::GrowIndex(GrowState::callback_t caller_callback) {
   return true;
 }
 
+// Some printing support for gtest
+std::ostream& operator << (std::ostream& out, const Status s) {
+  return out << (uint8_t)s;
+}
+
+std::ostream& operator << (std::ostream& out, const Guid guid) {
+  return out << guid.ToString();
+}
+
+std::ostream& operator << (std::ostream& out, const FixedPageAddress address) {
+  return out << address.control();
+}
+
 }
 } // namespace FASTER::core