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/resource_path.cc | |
| 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/resource_path.cc')
| -rw-r--r-- | Firestore/core/src/firebase/firestore/model/resource_path.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Firestore/core/src/firebase/firestore/model/resource_path.cc b/Firestore/core/src/firebase/firestore/model/resource_path.cc index 36218e9..a4f921f 100644 --- a/Firestore/core/src/firebase/firestore/model/resource_path.cc +++ b/Firestore/core/src/firebase/firestore/model/resource_path.cc @@ -18,6 +18,7 @@ #include <algorithm> #include <utility> +#include <vector> #include "Firestore/core/src/firebase/firestore/util/firebase_assert.h" #include "absl/strings/str_join.h" |