Selaa lähdekoodia

Trying newer grpc

Wu-Hui 3 vuotta sitten
vanhempi
sitoutus
89935cd5ef

+ 0 - 12
Firestore/core/test/unit/nanopb/message_test.cc

@@ -60,16 +60,8 @@ class MessageTest : public testing::Test {
   grpc::ByteBuffer BadProto() const {
     return {};
   }
-
- private:
-  // Note: gRPC slice will crash upon destruction if gRPC library hasn't been
-  // initialized, which is normally done by inheriting from this class (which
-  // does initialization in its constructor).
-  grpc::GrpcLibraryCodegen grpc_initializer_;
 };
 
-#if !__clang_analyzer__ || \
-    (defined(__has_feature) && !__has_feature(thread_sanitizer))
 TEST_F(MessageTest, Move) {
   ByteBufferReader reader{GoodProto()};
   auto message1 = TestMessage::TryParse(&reader);
@@ -77,11 +69,7 @@ TEST_F(MessageTest, Move) {
   TestMessage message2 = std::move(message1);
   EXPECT_EQ(message1.get(), nullptr);
   EXPECT_NE(message2.get(), nullptr);
-  // This shouldn't result in a leak or double deletion; Address Sanitizer
-  // should be able to verify that.
 }
-#endif  // !__clang_analyzer__ || (defined(__has_feature) &&
-        // !__has_feature(thread_sanitizer))
 
 TEST_F(MessageTest, ParseFailure) {
   ByteBufferReader reader{BadProto()};

+ 2 - 2
cmake/compiler_setup.cmake

@@ -14,8 +14,8 @@
 
 # C++ Compiler setup
 
-# We use C++11
-set(CMAKE_CXX_STANDARD 11)
+# We use C++14
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 

+ 1 - 2
cmake/external/abseil-cpp.cmake

@@ -14,7 +14,7 @@
 
 include(ExternalProject)
 
-set(version 20211102.0)
+set(version 20220623.1)
 
 ExternalProject_Add(
   abseil-cpp
@@ -22,7 +22,6 @@ ExternalProject_Add(
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
   DOWNLOAD_NAME abseil-cpp-${version}.tar.gz
   URL https://github.com/abseil/abseil-cpp/archive/${version}.tar.gz
-  URL_HASH SHA256=dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4
 
   PREFIX ${PROJECT_BINARY_DIR}
 

+ 1 - 2
cmake/external/grpc.cmake

@@ -18,7 +18,7 @@ if(TARGET grpc)
   return()
 endif()
 
-set(version 1.44.0)
+set(version 1.51.0)
 
 ExternalProject_Add(
   grpc
@@ -26,7 +26,6 @@ ExternalProject_Add(
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
   DOWNLOAD_NAME grpc-${version}.tar.gz
   URL https://github.com/grpc/grpc/archive/v${version}.tar.gz
-  URL_HASH SHA256=8c05641b9f91cbc92f51cc4a5b3a226788d7a63f20af4ca7aaca50d92cc94a0d
 
   PREFIX ${PROJECT_BINARY_DIR}
   SOURCE_DIR ${PROJECT_BINARY_DIR}/src/grpc