diff options
author | rsgowman <rgowman@google.com> | 2018-02-09 12:15:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 12:15:21 -0500 |
commit | 274fe52bbf817ef9d35638effb4de08454acfc6d (patch) | |
tree | d422177d355315a3314578c8554e4ebc86d1e042 /Firestore/core/src/firebase/firestore/model/field_value.h | |
parent | ecef4aa308c213c000d115123824d55482ffbdad (diff) |
cmake build fixes (#770)
* Fix nanopb (in cmake build)
Look for binaries in the src dir (since that's where we build now.) This
error would be masked if a previous build had completed prior to
switching nanopb to build out of src.
Also, don't patch the protoc path multiple times. This could be
triggered by (eg) 'make && make clean && make'.
* Add resource_path.{h,cc} to the cmake build
* Fix signed/unsigned int comparison warnings
* Ensure FieldValue tag_ is initialized during cp/mv ctor.
Otherwise, the assignment operator attempts to deallocate based on the
(uninitialized) tag_ variable, posssibly leading to segfaults.
* Fix tests that throw exceptions.
The (previous) tests checked to ensure that an abort() occurs, but if
ABSL_HAVE_EXCEPTIONS is defined on non-macos (which is currently the
default) then the assertions will throw a std::logic_error rather than
abort()ing.
On macos, an exception is thrown too, but the exception doesn't derrive
from std::exception, so ASSERT_DEATH_* doesn't catch it (hence why
ASSERT_DEATH_* actually works.)
To resolve this, I've switched to ASSERT_ANY_THROW.
Diffstat (limited to 'Firestore/core/src/firebase/firestore/model/field_value.h')
-rw-r--r-- | Firestore/core/src/firebase/firestore/model/field_value.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Firestore/core/src/firebase/firestore/model/field_value.h b/Firestore/core/src/firebase/firestore/model/field_value.h index 4cd0b3d..d43b23f 100644 --- a/Firestore/core/src/firebase/firestore/model/field_value.h +++ b/Firestore/core/src/firebase/firestore/model/field_value.h @@ -69,7 +69,7 @@ class FieldValue { // position instead, see the doc comment above. }; - FieldValue() : tag_(Type::Null) { + FieldValue() { } // Do not inline these ctor/dtor below, which contain call to non-trivial @@ -123,7 +123,7 @@ class FieldValue { */ void SwitchTo(const Type type); - Type tag_; + Type tag_ = Type::Null; union { // There is no null type as tag_ alone is enough for Null FieldValue. bool boolean_value_; |