diff options
| author |  Gil <mcg@google.com> | 2018-06-04 13:06:43 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-04 13:06:43 -0700 |
| commit | dc4f87527f61f0d20a5fc175ca19ad3f367133c1 (patch) | |
| tree | 1ba5b038cdfaf82513d97d76b591b3a736c647bd /Firestore/core | |
| parent | 26b8ac9ee43bb67b08e4bc62af98ac6bda2f121c (diff) | |
Build cleanup (#1375)
* Remove extraneous firebase_firestore_util_async_queue target
* Remove unimplemented declaration in string_util.h
Diffstat (limited to 'Firestore/core')
3 files changed, 6 insertions, 18 deletions
diff --git a/Firestore/core/src/firebase/firestore/util/CMakeLists.txt b/Firestore/core/src/firebase/firestore/util/CMakeLists.txt index ed3a301..30589a0 100644 --- a/Firestore/core/src/firebase/firestore/util/CMakeLists.txt +++ b/Firestore/core/src/firebase/firestore/util/CMakeLists.txt @@ -29,6 +29,7 @@ cc_library( absl_strings ) + ## assert and log cc_library( @@ -158,16 +159,6 @@ else() endif() -cc_library( - firebase_firestore_util_async_queue - SOURCES - async_queue.cc - async_queue.h - DEPENDS - ${FIREBASE_FIRESTORE_UTIL_EXECUTOR} - ${FIREBASE_FIRESTORE_UTIL_LOG} - EXCLUDE_FROM_ALL -) ## main library @@ -179,6 +170,8 @@ configure_file( cc_library( firebase_firestore_util SOURCES + async_queue.cc + async_queue.h autoid.cc autoid.h bits.cc @@ -204,7 +197,7 @@ cc_library( DEPENDS absl_base firebase_firestore_util_base - firebase_firestore_util_async_queue + ${FIREBASE_FIRESTORE_UTIL_EXECUTOR} ${FIREBASE_FIRESTORE_UTIL_LOG} ${FIREBASE_FIRESTORE_UTIL_RANDOM} ) diff --git a/Firestore/core/src/firebase/firestore/util/string_util.h b/Firestore/core/src/firebase/firestore/util/string_util.h index 96ba0b0..86acc56 100644 --- a/Firestore/core/src/firebase/firestore/util/string_util.h +++ b/Firestore/core/src/firebase/firestore/util/string_util.h @@ -65,11 +65,6 @@ std::string PrefixSuccessor(absl::string_view prefix); */ std::string ImmediateSuccessor(absl::string_view s); -/** - * Returns true if the given value starts with the given prefix. - */ -bool StartsWith(const std::string &value, const std::string &prefix); - } // namespace util } // namespace firestore } // namespace firebase diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt index c07a4ea..44a3b61 100644 --- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt +++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt @@ -98,7 +98,7 @@ cc_test( async_tests_util.h DEPENDS firebase_firestore_util_executor_std - firebase_firestore_util_async_queue + firebase_firestore_util ) if(HAVE_LIBDISPATCH) @@ -111,7 +111,7 @@ if(HAVE_LIBDISPATCH) async_tests_util.h DEPENDS firebase_firestore_util_executor_libdispatch - firebase_firestore_util_async_queue + firebase_firestore_util ) endif() |