From 52334d251b167c150a1d0352f92f926f9a80f392 Mon Sep 17 00:00:00 2001 From: Gil Date: Thu, 15 Mar 2018 15:45:54 -0700 Subject: Move core/types.h to model to prevent a core -> local -> core dependency cycle (#929) --- .../firebase/firestore/core/target_id_generator.cc | 2 ++ .../firebase/firestore/core/target_id_generator.h | 12 ++++---- Firestore/core/src/firebase/firestore/core/types.h | 32 ---------------------- .../src/firebase/firestore/model/CMakeLists.txt | 1 + .../core/src/firebase/firestore/model/types.h | 32 ++++++++++++++++++++++ 5 files changed, 41 insertions(+), 38 deletions(-) delete mode 100644 Firestore/core/src/firebase/firestore/core/types.h create mode 100644 Firestore/core/src/firebase/firestore/model/types.h (limited to 'Firestore') diff --git a/Firestore/core/src/firebase/firestore/core/target_id_generator.cc b/Firestore/core/src/firebase/firestore/core/target_id_generator.cc index 6d23d64..473d083 100644 --- a/Firestore/core/src/firebase/firestore/core/target_id_generator.cc +++ b/Firestore/core/src/firebase/firestore/core/target_id_generator.cc @@ -16,6 +16,8 @@ #include "Firestore/core/src/firebase/firestore/core/target_id_generator.h" +using firebase::firestore::model::TargetId; + namespace firebase { namespace firestore { namespace core { diff --git a/Firestore/core/src/firebase/firestore/core/target_id_generator.h b/Firestore/core/src/firebase/firestore/core/target_id_generator.h index 7d30cf9..870e731 100644 --- a/Firestore/core/src/firebase/firestore/core/target_id_generator.h +++ b/Firestore/core/src/firebase/firestore/core/target_id_generator.h @@ -17,7 +17,7 @@ #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TARGET_ID_GENERATOR_H_ #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TARGET_ID_GENERATOR_H_ -#include "Firestore/core/src/firebase/firestore/core/types.h" +#include "Firestore/core/src/firebase/firestore/model/types.h" namespace firebase { namespace firestore { @@ -48,7 +48,7 @@ class TargetIdGenerator { * @param after An ID to start at. Every call to NextId returns a larger id. * @return An instance of TargetIdGenerator. */ - static TargetIdGenerator LocalStoreTargetIdGenerator(TargetId after) { + static TargetIdGenerator LocalStoreTargetIdGenerator(model::TargetId after) { return TargetIdGenerator(TargetIdGeneratorId::LocalStore, after); } @@ -58,7 +58,7 @@ class TargetIdGenerator { * @param after An ID to start at. Every call to NextId returns a larger id. * @return An instance of TargetIdGenerator. */ - static TargetIdGenerator SyncEngineTargetIdGenerator(TargetId after) { + static TargetIdGenerator SyncEngineTargetIdGenerator(model::TargetId after) { return TargetIdGenerator(TargetIdGeneratorId::SyncEngine, after); } @@ -66,12 +66,12 @@ class TargetIdGenerator { return generator_id_; } - TargetId NextId(); + model::TargetId NextId(); private: - TargetIdGenerator(TargetIdGeneratorId generator_id, TargetId after); + TargetIdGenerator(TargetIdGeneratorId generator_id, model::TargetId after); TargetIdGeneratorId generator_id_; - TargetId previous_id_; + model::TargetId previous_id_; static const int kReservedBits = 1; }; diff --git a/Firestore/core/src/firebase/firestore/core/types.h b/Firestore/core/src/firebase/firestore/core/types.h deleted file mode 100644 index 65c2b8c..0000000 --- a/Firestore/core/src/firebase/firestore/core/types.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2018 Google - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TYPES_H_ -#define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TYPES_H_ - -#include - -namespace firebase { -namespace firestore { -namespace core { - -typedef int32_t TargetId; - -} // namespace core -} // namespace firestore -} // namespace firebase - -#endif // FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TYPES_H_ diff --git a/Firestore/core/src/firebase/firestore/model/CMakeLists.txt b/Firestore/core/src/firebase/firestore/model/CMakeLists.txt index 1b0e6a4..e7824e3 100644 --- a/Firestore/core/src/firebase/firestore/model/CMakeLists.txt +++ b/Firestore/core/src/firebase/firestore/model/CMakeLists.txt @@ -36,6 +36,7 @@ cc_library( snapshot_version.h timestamp.cc timestamp.h + types.h DEPENDS absl_strings firebase_firestore_util diff --git a/Firestore/core/src/firebase/firestore/model/types.h b/Firestore/core/src/firebase/firestore/model/types.h new file mode 100644 index 0000000..4f71829 --- /dev/null +++ b/Firestore/core/src/firebase/firestore/model/types.h @@ -0,0 +1,32 @@ +/* + * Copyright 2018 Google + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_TYPES_H_ +#define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_TYPES_H_ + +#include + +namespace firebase { +namespace firestore { +namespace model { + +typedef int32_t TargetId; + +} // namespace model +} // namespace firestore +} // namespace firebase + +#endif // FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_MODEL_TYPES_H_ -- cgit v1.2.3