diff options
9 files changed, 54 insertions, 44 deletions
diff --git a/Firestore/core/src/firebase/firestore/model/field_value.cc b/Firestore/core/src/firebase/firestore/model/field_value.cc index b063543..570226e 100644 --- a/Firestore/core/src/firebase/firestore/model/field_value.cc +++ b/Firestore/core/src/firebase/firestore/model/field_value.cc @@ -95,7 +95,7 @@ FieldValue& FieldValue::operator=(const FieldValue& value) { break; case Type::Blob: { // copy-and-swap - std::vector<const uint8_t> tmp = value.blob_value_; + std::vector<uint8_t> tmp = value.blob_value_; std::swap(blob_value_, tmp); break; } @@ -104,7 +104,7 @@ FieldValue& FieldValue::operator=(const FieldValue& value) { break; case Type::Array: { // copy-and-swap - std::vector<const FieldValue> tmp = value.array_value_; + std::vector<FieldValue> tmp = value.array_value_; std::swap(array_value_, tmp); break; } @@ -228,7 +228,7 @@ FieldValue FieldValue::StringValue(std::string&& value) { FieldValue FieldValue::BlobValue(const uint8_t* source, size_t size) { FieldValue result; result.SwitchTo(Type::Blob); - std::vector<const uint8_t> copy(source, source + size); + std::vector<uint8_t> copy(source, source + size); std::swap(result.blob_value_, copy); return result; } @@ -240,12 +240,12 @@ FieldValue FieldValue::GeoPointValue(const GeoPoint& value) { return result; } -FieldValue FieldValue::ArrayValue(const std::vector<const FieldValue>& value) { - std::vector<const FieldValue> copy(value); +FieldValue FieldValue::ArrayValue(const std::vector<FieldValue>& value) { + std::vector<FieldValue> copy(value); return ArrayValue(std::move(copy)); } -FieldValue FieldValue::ArrayValue(std::vector<const FieldValue>&& value) { +FieldValue FieldValue::ArrayValue(std::vector<FieldValue>&& value) { FieldValue result; result.SwitchTo(Type::Array); std::swap(result.array_value_, value); @@ -368,13 +368,13 @@ void FieldValue::SwitchTo(const Type type) { break; case Type::Blob: // Do not even bother to allocate a new array of size 0. - new (&blob_value_) std::vector<const uint8_t>(); + new (&blob_value_) std::vector<uint8_t>(); break; case Type::GeoPoint: new (&geo_point_value_) GeoPoint(); break; case Type::Array: - new (&array_value_) std::vector<const FieldValue>(); + new (&array_value_) std::vector<FieldValue>(); break; case Type::Object: new (&object_value_) std::map<const std::string, const FieldValue>(); diff --git a/Firestore/core/src/firebase/firestore/model/field_value.h b/Firestore/core/src/firebase/firestore/model/field_value.h index bb6594f..4cd0b3d 100644 --- a/Firestore/core/src/firebase/firestore/model/field_value.h +++ b/Firestore/core/src/firebase/firestore/model/field_value.h @@ -105,8 +105,8 @@ class FieldValue { static FieldValue BlobValue(const uint8_t* source, size_t size); // static FieldValue ReferenceValue(); static FieldValue GeoPointValue(const GeoPoint& value); - static FieldValue ArrayValue(const std::vector<const FieldValue>& value); - static FieldValue ArrayValue(std::vector<const FieldValue>&& value); + static FieldValue ArrayValue(const std::vector<FieldValue>& value); + static FieldValue ArrayValue(std::vector<FieldValue>&& value); static FieldValue ObjectValue( const std::map<const std::string, const FieldValue>& value); static FieldValue ObjectValue( @@ -132,9 +132,9 @@ class FieldValue { Timestamp timestamp_value_; ServerTimestamp server_timestamp_value_; std::string string_value_; - std::vector<const uint8_t> blob_value_; + std::vector<uint8_t> blob_value_; GeoPoint geo_point_value_; - std::vector<const FieldValue> array_value_; + std::vector<FieldValue> array_value_; std::map<const std::string, const FieldValue> object_value_; }; }; diff --git a/Firestore/core/src/firebase/firestore/util/assert_stdio.cc b/Firestore/core/src/firebase/firestore/util/assert_stdio.cc index f0d5251..1d2e333 100644 --- a/Firestore/core/src/firebase/firestore/util/assert_stdio.cc +++ b/Firestore/core/src/firebase/firestore/util/assert_stdio.cc @@ -16,7 +16,7 @@ #include <stdarg.h> -#include <exception> +#include <stdexcept> #include <string> #include "Firestore/core/src/firebase/firestore/util/firebase_assert.h" diff --git a/Firestore/core/test/firebase/firestore/core/target_id_generator_test.cc b/Firestore/core/test/firebase/firestore/core/target_id_generator_test.cc index c98bfd3..7eca335 100644 --- a/Firestore/core/test/firebase/firestore/core/target_id_generator_test.cc +++ b/Firestore/core/test/firebase/firestore/core/target_id_generator_test.cc @@ -43,8 +43,8 @@ TEST(TargetIdGenerator, SkipPast) { for (int i = 4; i < 12; ++i) { TargetIdGenerator a = TargetIdGenerator::LocalStoreTargetIdGenerator(i); TargetIdGenerator b = TargetIdGenerator::SyncEngineTargetIdGenerator(i); - EXPECT_EQ(i + 2 & ~1, a.NextId()); - EXPECT_EQ(i + 1 | 1, b.NextId()); + EXPECT_EQ((i + 2) & ~1, a.NextId()); + EXPECT_EQ((i + 1) | 1, b.NextId()); } EXPECT_EQ(13, TargetIdGenerator::SyncEngineTargetIdGenerator(12).NextId()); diff --git a/Firestore/core/test/firebase/firestore/model/field_value_test.cc b/Firestore/core/test/firebase/firestore/model/field_value_test.cc index a006d46..702c0f6 100644 --- a/Firestore/core/test/firebase/firestore/model/field_value_test.cc +++ b/Firestore/core/test/firebase/firestore/model/field_value_test.cc @@ -16,6 +16,8 @@ #include "Firestore/core/src/firebase/firestore/model/field_value.h" +#include <limits.h> + #include <vector> #include "gtest/gtest.h" @@ -152,15 +154,14 @@ TEST(FieldValue, GeoPointType) { } TEST(FieldValue, ArrayType) { - const FieldValue empty = - FieldValue::ArrayValue(std::vector<const FieldValue>{}); - std::vector<const FieldValue> array{FieldValue::NullValue(), - FieldValue::BooleanValue(true), - FieldValue::BooleanValue(false)}; + const FieldValue empty = FieldValue::ArrayValue(std::vector<FieldValue>{}); + std::vector<FieldValue> array{FieldValue::NullValue(), + FieldValue::BooleanValue(true), + FieldValue::BooleanValue(false)}; // copy the array const FieldValue small = FieldValue::ArrayValue(array); - std::vector<const FieldValue> another_array{FieldValue::BooleanValue(true), - FieldValue::BooleanValue(false)}; + std::vector<FieldValue> another_array{FieldValue::BooleanValue(true), + FieldValue::BooleanValue(false)}; // move the array const FieldValue large = FieldValue::ArrayValue(std::move(another_array)); EXPECT_EQ(Type::Array, empty.type()); @@ -288,18 +289,17 @@ TEST(FieldValue, Copy) { clone = null_value; EXPECT_EQ(FieldValue::NullValue(), clone); - const FieldValue array_value = - FieldValue::ArrayValue(std::vector<const FieldValue>{ - FieldValue::TrueValue(), FieldValue::FalseValue()}); + const FieldValue array_value = FieldValue::ArrayValue(std::vector<FieldValue>{ + FieldValue::TrueValue(), FieldValue::FalseValue()}); clone = array_value; - EXPECT_EQ(FieldValue::ArrayValue(std::vector<const FieldValue>{ + EXPECT_EQ(FieldValue::ArrayValue(std::vector<FieldValue>{ FieldValue::TrueValue(), FieldValue::FalseValue()}), clone); - EXPECT_EQ(FieldValue::ArrayValue(std::vector<const FieldValue>{ + EXPECT_EQ(FieldValue::ArrayValue(std::vector<FieldValue>{ FieldValue::TrueValue(), FieldValue::FalseValue()}), array_value); clone = clone; - EXPECT_EQ(FieldValue::ArrayValue(std::vector<const FieldValue>{ + EXPECT_EQ(FieldValue::ArrayValue(std::vector<FieldValue>{ FieldValue::TrueValue(), FieldValue::FalseValue()}), clone); clone = null_value; @@ -385,10 +385,10 @@ TEST(FieldValue, Move) { clone = null_value; EXPECT_EQ(FieldValue::NullValue(), clone); - FieldValue array_value = FieldValue::ArrayValue(std::vector<const FieldValue>{ + FieldValue array_value = FieldValue::ArrayValue(std::vector<FieldValue>{ FieldValue::TrueValue(), FieldValue::FalseValue()}); clone = std::move(array_value); - EXPECT_EQ(FieldValue::ArrayValue(std::vector<const FieldValue>{ + EXPECT_EQ(FieldValue::ArrayValue(std::vector<FieldValue>{ FieldValue::TrueValue(), FieldValue::FalseValue()}), clone); clone = FieldValue::NullValue(); @@ -417,7 +417,7 @@ TEST(FieldValue, CompareMixedType) { const FieldValue blob_value = FieldValue::BlobValue(Bytes("abc"), 4); const FieldValue geo_point_value = FieldValue::GeoPointValue({1, 2}); const FieldValue array_value = - FieldValue::ArrayValue(std::vector<const FieldValue>()); + FieldValue::ArrayValue(std::vector<FieldValue>()); const FieldValue object_value = FieldValue::ObjectValue(std::map<const std::string, const FieldValue>()); EXPECT_TRUE(null_value < true_value); diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt index eb5a898..93cca16 100644 --- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt +++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt @@ -12,6 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +set(CMAKE_CXX_EXTENSIONS ON) + +# Required to allow 0 length printf style strings for testing purposes. +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-zero-length") + if(HAVE_ARC4RANDOM) cc_test( firebase_firestore_util_arc4random_test diff --git a/Firestore/core/test/firebase/firestore/util/comparison_test.cc b/Firestore/core/test/firebase/firestore/util/comparison_test.cc index ecbed4a..ccb3011 100644 --- a/Firestore/core/test/firebase/firestore/util/comparison_test.cc +++ b/Firestore/core/test/firebase/firestore/util/comparison_test.cc @@ -16,6 +16,7 @@ #include "Firestore/core/src/firebase/firestore/util/comparison.h" +#include <inttypes.h> #include <math.h> #include <limits> @@ -84,17 +85,17 @@ TEST(Comparison, DoubleCompare) { ASSERT_SAME(Compare<double>(-0, 0)); } -#define ASSERT_BIT_EQUALS(expected, actual) \ - do { \ - uint64_t expectedBits = DoubleBits(expected); \ - uint64_t actualBits = DoubleBits(actual); \ - if (expectedBits != actualBits) { \ - std::string message = StringPrintf( \ - "Expected <%f> to compare equal to <%f> " \ - "with bits <%llX> equal to <%llX>", \ - actual, expected, actualBits, expectedBits); \ - FAIL() << message; \ - } \ +#define ASSERT_BIT_EQUALS(expected, actual) \ + do { \ + uint64_t expectedBits = DoubleBits(expected); \ + uint64_t actualBits = DoubleBits(actual); \ + if (expectedBits != actualBits) { \ + std::string message = StringPrintf( \ + "Expected <%f> to compare equal to <%f> " \ + "with bits <%" PRIu64 "> equal to <%" PRIu64 ">", \ + actual, expected, actualBits, expectedBits); \ + FAIL() << message; \ + } \ } while (0); #define ASSERT_MIXED_SAME(doubleValue, longValue) \ diff --git a/Firestore/core/test/firebase/firestore/util/log_test.cc b/Firestore/core/test/firebase/firestore/util/log_test.cc index 46cbc4e..973b174 100644 --- a/Firestore/core/test/firebase/firestore/util/log_test.cc +++ b/Firestore/core/test/firebase/firestore/util/log_test.cc @@ -30,7 +30,7 @@ namespace util { // // You can fix it with: // -// defaults write firebase_firestore_util_log_apple_test \ +// defaults write firebase_firestore_util_log_apple_test // /google/firebase/debug_mode NO TEST(Log, SetAndGet) { LogSetLevel(kLogLevelVerbose); diff --git a/cmake/CompilerSetup.cmake b/cmake/CompilerSetup.cmake index 8bcfa76..d026f82 100644 --- a/cmake/CompilerSetup.cmake +++ b/cmake/CompilerSetup.cmake @@ -41,6 +41,10 @@ if(CLANG OR GNU) # Delete unused things -Wunused-function -Wunused-value -Wunused-variable + ) + + set( + cxx_flags # Cut down on symbol clutter # TODO(wilhuff) try -fvisibility=hidden @@ -64,7 +68,7 @@ if(CLANG OR GNU) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") endforeach() - foreach(flag ${common_flags}) + foreach(flag ${common_flags} ${cxx_flags}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") endforeach() endif() |