diff options
3 files changed, 12 insertions, 13 deletions
diff --git a/Firestore/core/src/firebase/firestore/model/CMakeLists.txt b/Firestore/core/src/firebase/firestore/model/CMakeLists.txt index 1beb3bb..ae80de3 100644 --- a/Firestore/core/src/firebase/firestore/model/CMakeLists.txt +++ b/Firestore/core/src/firebase/firestore/model/CMakeLists.txt @@ -12,11 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -add_library( +cc_library( firebase_firestore_model - field_value.cc -) -target_link_libraries( - firebase_firestore_model - firebase_firestore_util + SOURCES + field_value.cc + DEPENDS + firebase_firestore_util ) diff --git a/Firestore/core/src/firebase/firestore/model/field_value.cc b/Firestore/core/src/firebase/firestore/model/field_value.cc index 5a19549..45886bf 100644 --- a/Firestore/core/src/firebase/firestore/model/field_value.cc +++ b/Firestore/core/src/firebase/firestore/model/field_value.cc @@ -18,6 +18,7 @@ #include <algorithm> #include <memory> +#include <utility> #include <vector> #include "Firestore/core/src/firebase/firestore/util/firebase_assert.h" @@ -159,7 +160,7 @@ void FieldValue::SwitchTo(const Type type) { case Type::Array: array_value_.~vector(); break; - default:; // The other types where there is nothing to worry about. + default: {} // The other types where there is nothing to worry about. } tag_ = type; // Must call constructor explicitly for any non-POD type to initialize. @@ -167,7 +168,7 @@ void FieldValue::SwitchTo(const Type type) { case Type::Array: new (&array_value_) std::vector<const FieldValue>(); break; - default:; // The other types where there is nothing to worry about. + default: {} // The other types where there is nothing to worry about. } } diff --git a/Firestore/core/test/firebase/firestore/model/CMakeLists.txt b/Firestore/core/test/firebase/firestore/model/CMakeLists.txt index f5d9c2c..31fe040 100644 --- a/Firestore/core/test/firebase/firestore/model/CMakeLists.txt +++ b/Firestore/core/test/firebase/firestore/model/CMakeLists.txt @@ -14,9 +14,8 @@ cc_test( firebase_firestore_model_test - field_value_test.cc -) -target_link_libraries( - firebase_firestore_model_test - firebase_firestore_model + SOURCES + field_value_test.cc + DEPENDS + firebase_firestore_model ) |