fix some syntaxs

firebase · Jan 9, 2025 · 0e652a7 · 0e652a7
1 parent dbf10d8
commit 0e652a7
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 25 deletions.
diff --git a/Firestore/core/interfaceForSwift/api/FirebaseFirestoreCpp.h b/Firestore/core/interfaceForSwift/api/FirebaseFirestoreCpp.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_FIREBASEFIRESTORECPP_H
-#define FIREBASE_FIREBASEFIRESTORECPP_H
+#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIREBASEFIRESTORECPP_H_
+#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIREBASEFIRESTORECPP_H_
 
 #import "collection_stage.h"
 #import "firestore_pipeline.h"
@@ -24,4 +24,4 @@
 #import "pipeline_source.h"
 #import "stage.h"
 
-#endif  // FIREBASE_FIREBASEFIRESTORECPP_H
+#endif  // FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIREBASEFIRESTORECPP_H_
diff --git a/Firestore/core/interfaceForSwift/api/collection_stage.cc b/Firestore/core/interfaceForSwift/api/collection_stage.cc
@@ -23,9 +23,9 @@ namespace api {
 Collection::Collection(std::string collection_path)
     : collection_path_(collection_path) {
   std::cout << "Calling Pipeline Collection ctor" << std::endl;
-};
+}
 
 }  // namespace api
 
 }  // namespace firestore
-}  // namespace firebase
+}  // namespace firebase
diff --git a/Firestore/core/interfaceForSwift/api/collection_stage.h b/Firestore/core/interfaceForSwift/api/collection_stage.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_COLLECTION_GROUP_STAGE_H
-#define FIREBASE_COLLECTION_GROUP_STAGE_H
+#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_COLLECTION_STAGE_H_
+#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_COLLECTION_STAGE_H_
 
 #include <string>
 #include "stage.h"
@@ -25,7 +25,7 @@ namespace api {
 
 class Collection : public Stage {
  public:
-  Collection(std::string collection_path);
+  explicit Collection(std::string collection_path);
 
  private:
   std::string collection_path_;
@@ -36,4 +36,4 @@ class Collection : public Stage {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_COLLECTION_GROUP_STAGE_H
+#endif  // FIRESTORE_CORE_INTERFACEFORSWIFT_API_COLLECTION_STAGE_H_
diff --git a/Firestore/core/interfaceForSwift/api/firestore_pipeline.cc b/Firestore/core/interfaceForSwift/api/firestore_pipeline.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include "Firestore/core/interfaceForSwift/api/firestore_pipeline.h"
+
+#include <memory>
+
 #include "Firestore/core/src/api/firestore.h"
 
 namespace firebase {

diff --git a/Firestore/core/interfaceForSwift/api/firestore_pipeline.h b/Firestore/core/interfaceForSwift/api/firestore_pipeline.h
@@ -12,8 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_FIRESTORE_PIPELINE_H
-#define FIREBASE_FIRESTORE_PIPELINE_H
+#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIRESTORE_PIPELINE_H_
+#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIRESTORE_PIPELINE_H_
+
+#include <memory>
 
 #include "pipeline_source.h"
 
@@ -32,4 +34,4 @@ class FirestorePipeline {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_FIRESTORE_PIPELINE_H
+#endif  // FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIRESTORE_PIPELINE_H_
diff --git a/Firestore/core/interfaceForSwift/api/pipeline.h b/Firestore/core/interfaceForSwift/api/pipeline.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_PIPELINE_H
-#define FIREBASE_PIPELINE_H
+#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_H_
+#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_H_
 
 #include <functional>
 #include <memory>
@@ -57,4 +57,4 @@ class Pipeline {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_PIPELINE_H
+#endif  // FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_H_
diff --git a/Firestore/core/interfaceForSwift/api/pipeline_result.h b/Firestore/core/interfaceForSwift/api/pipeline_result.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_PIPELINE_RESULT_H
-#define FIREBASE_PIPELINE_RESULT_H
+#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_RESULT_H_
+#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_RESULT_H_
 
 #include <memory>
 
@@ -48,4 +48,4 @@ class PipelineResult {
 
 }  // namespace firestore
 }  // namespace firebase
-#endif  // FIREBASE_PIPELINE_RESULT_H
+#endif  // FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_RESULT_H_
diff --git a/Firestore/core/interfaceForSwift/api/pipeline_source.cc b/Firestore/core/interfaceForSwift/api/pipeline_source.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 #include "Firestore/core/interfaceForSwift/api/pipeline_source.h"
+
+#include <string>
+
 #include "Firestore/core/interfaceForSwift/api/collection_stage.h"
 #include "Firestore/core/src/api/document_reference.h"
 #include "Firestore/core/src/api/firestore.h"

diff --git a/Firestore/core/interfaceForSwift/api/pipeline_source.h b/Firestore/core/interfaceForSwift/api/pipeline_source.h
@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_PIPELINE_SOURCE_H
-#define FIREBASE_PIPELINE_SOURCE_H
+#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_SOURCE_H_
+#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_SOURCE_H_
 
 #include <memory>
+#include <string>
 #include <vector>
+
 #include "pipeline.h"
 
 namespace firebase {
@@ -29,7 +31,7 @@ class DocumentReference;
 
 class PipelineSource {
  public:
-  PipelineSource(std::shared_ptr<Firestore> firestore);
+  explicit PipelineSource(std::shared_ptr<Firestore> firestore);
 
   Pipeline GetCollection(std::string collection_path) const;
 
@@ -42,4 +44,4 @@ class PipelineSource {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_PIPELINE_SOURCE_H
+#endif  // FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_SOURCE_H_
diff --git a/Firestore/core/interfaceForSwift/api/stage.h b/Firestore/core/interfaceForSwift/api/stage.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FIREBASE_STAGE_H
-#define FIREBASE_STAGE_H
+#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_STAGE_H_
+#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_STAGE_H_
 
 namespace firebase {
 namespace firestore {
@@ -30,4 +30,4 @@ class Stage {
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIREBASE_STAGE_H
+#endif  // FIRESTORE_CORE_INTERFACEFORSWIFT_API_STAGE_H_