From a74d39f02b93c2e7bf121b33ab2164a9ac34e66b Mon Sep 17 00:00:00 2001 From: rsgowman Date: Sat, 27 Jan 2018 19:16:41 -0500 Subject: Fix a number of c++ build errors (#715) * Move -fvisibility-inlines-hidden from common_flags to cxx_flags This option isn't supported by C (and causes the build to fail under at least rodete). Manifested error was: ``` -- Looking for include file openssl/rand.h -- Looking for include file openssl/rand.h - not found CMake Error at core/src/firebase/firestore/util/CMakeLists.txt:94 (message): No implementation for SecureRandom available. -- Configuring incomplete, errors occurred! ``` which is completely misleading. :( * Fix exception include for std::logic_error Was causing compiler error on (at least) rodete. (http://en.cppreference.com/w/cpp/error/logic_error suggests that stdexcept is the correct header.) * Remove 'const' from vector contents. vectors cannot contain const objects as the contained objects are required to be assignable and copy constructable. (Not *quite* strictly true; since c++11, this requirement now depends on the operations performed on the container. But my compiler objects at any rate.) http://en.cppreference.com/w/cpp/container/vector https://stackoverflow.com/questions/8685257/why-cant-you-put-a-const-object-into-a-stl-container * Add brackets as suggested (required) by my compiler. * Add missing include For LLONG_MIN, etc. * Enable gnu extension to c++11 for firestore/util *test*. We disable them by default (in cmake/CompilerSetup.cmake) but our tests requires hexidecimal floating point, which is not supported in c++11 (though is supported in C++17, gnu++11, and others). http://en.cppreference.com/w/cpp/language/floating_literal https://bugzilla.redhat.com/show_bug.cgi?id=1321986 * Fix printf format for uint64_t http://en.cppreference.com/w/cpp/types/integer https://stackoverflow.com/questions/9225567/how-to-print-a-int64-t-type-in-c * Allow 0 length printf template strings in tests. * Get rid of a multi line comment. The backslash is apparently interpreted by the compiler cause the next line to be ignored too. In this case, the next line is (currently) a comment, and would be ignored anyways. (But that doesn't stop the compiler from yelling.) * Run ./scripts/style.sh --- Firestore/core/src/firebase/firestore/model/field_value.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Firestore/core/src/firebase/firestore/model/field_value.h') 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& value); - static FieldValue ArrayValue(std::vector&& value); + static FieldValue ArrayValue(const std::vector& value); + static FieldValue ArrayValue(std::vector&& value); static FieldValue ObjectValue( const std::map& value); static FieldValue ObjectValue( @@ -132,9 +132,9 @@ class FieldValue { Timestamp timestamp_value_; ServerTimestamp server_timestamp_value_; std::string string_value_; - std::vector blob_value_; + std::vector blob_value_; GeoPoint geo_point_value_; - std::vector array_value_; + std::vector array_value_; std::map object_value_; }; }; -- cgit v1.2.3