Skip to content

Commit 0e652a7

Browse files
committed
fix some syntaxs
1 parent dbf10d8 commit 0e652a7

File tree

10 files changed

+35
-25
lines changed

10 files changed

+35
-25
lines changed

Firestore/core/interfaceForSwift/api/FirebaseFirestoreCpp.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#ifndef FIREBASE_FIREBASEFIRESTORECPP_H
18-
#define FIREBASE_FIREBASEFIRESTORECPP_H
17+
#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIREBASEFIRESTORECPP_H_
18+
#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIREBASEFIRESTORECPP_H_
1919

2020
#import "collection_stage.h"
2121
#import "firestore_pipeline.h"
@@ -24,4 +24,4 @@
2424
#import "pipeline_source.h"
2525
#import "stage.h"
2626

27-
#endif // FIREBASE_FIREBASEFIRESTORECPP_H
27+
#endif // FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIREBASEFIRESTORECPP_H_

Firestore/core/interfaceForSwift/api/collection_stage.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ namespace api {
2323
Collection::Collection(std::string collection_path)
2424
: collection_path_(collection_path) {
2525
std::cout << "Calling Pipeline Collection ctor" << std::endl;
26-
};
26+
}
2727

2828
} // namespace api
2929

3030
} // namespace firestore
31-
} // namespace firebase
31+
} // namespace firebase

Firestore/core/interfaceForSwift/api/collection_stage.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef FIREBASE_COLLECTION_GROUP_STAGE_H
16-
#define FIREBASE_COLLECTION_GROUP_STAGE_H
15+
#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_COLLECTION_STAGE_H_
16+
#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_COLLECTION_STAGE_H_
1717

1818
#include <string>
1919
#include "stage.h"
@@ -25,7 +25,7 @@ namespace api {
2525

2626
class Collection : public Stage {
2727
public:
28-
Collection(std::string collection_path);
28+
explicit Collection(std::string collection_path);
2929

3030
private:
3131
std::string collection_path_;
@@ -36,4 +36,4 @@ class Collection : public Stage {
3636
} // namespace firestore
3737
} // namespace firebase
3838

39-
#endif // FIREBASE_COLLECTION_GROUP_STAGE_H
39+
#endif // FIRESTORE_CORE_INTERFACEFORSWIFT_API_COLLECTION_STAGE_H_

Firestore/core/interfaceForSwift/api/firestore_pipeline.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
// limitations under the License.
1414

1515
#include "Firestore/core/interfaceForSwift/api/firestore_pipeline.h"
16+
17+
#include <memory>
18+
1619
#include "Firestore/core/src/api/firestore.h"
1720

1821
namespace firebase {

Firestore/core/interfaceForSwift/api/firestore_pipeline.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef FIREBASE_FIRESTORE_PIPELINE_H
16-
#define FIREBASE_FIRESTORE_PIPELINE_H
15+
#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIRESTORE_PIPELINE_H_
16+
#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIRESTORE_PIPELINE_H_
17+
18+
#include <memory>
1719

1820
#include "pipeline_source.h"
1921

@@ -32,4 +34,4 @@ class FirestorePipeline {
3234
} // namespace firestore
3335
} // namespace firebase
3436

35-
#endif // FIREBASE_FIRESTORE_PIPELINE_H
37+
#endif // FIRESTORE_CORE_INTERFACEFORSWIFT_API_FIRESTORE_PIPELINE_H_

Firestore/core/interfaceForSwift/api/pipeline.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef FIREBASE_PIPELINE_H
16-
#define FIREBASE_PIPELINE_H
15+
#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_H_
16+
#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_H_
1717

1818
#include <functional>
1919
#include <memory>
@@ -57,4 +57,4 @@ class Pipeline {
5757
} // namespace firestore
5858
} // namespace firebase
5959

60-
#endif // FIREBASE_PIPELINE_H
60+
#endif // FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_H_

Firestore/core/interfaceForSwift/api/pipeline_result.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef FIREBASE_PIPELINE_RESULT_H
16-
#define FIREBASE_PIPELINE_RESULT_H
15+
#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_RESULT_H_
16+
#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_RESULT_H_
1717

1818
#include <memory>
1919

@@ -48,4 +48,4 @@ class PipelineResult {
4848

4949
} // namespace firestore
5050
} // namespace firebase
51-
#endif // FIREBASE_PIPELINE_RESULT_H
51+
#endif // FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_RESULT_H_

Firestore/core/interfaceForSwift/api/pipeline_source.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
// limitations under the License.
1414

1515
#include "Firestore/core/interfaceForSwift/api/pipeline_source.h"
16+
17+
#include <string>
18+
1619
#include "Firestore/core/interfaceForSwift/api/collection_stage.h"
1720
#include "Firestore/core/src/api/document_reference.h"
1821
#include "Firestore/core/src/api/firestore.h"

Firestore/core/interfaceForSwift/api/pipeline_source.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef FIREBASE_PIPELINE_SOURCE_H
16-
#define FIREBASE_PIPELINE_SOURCE_H
15+
#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_SOURCE_H_
16+
#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_SOURCE_H_
1717

1818
#include <memory>
19+
#include <string>
1920
#include <vector>
21+
2022
#include "pipeline.h"
2123

2224
namespace firebase {
@@ -29,7 +31,7 @@ class DocumentReference;
2931

3032
class PipelineSource {
3133
public:
32-
PipelineSource(std::shared_ptr<Firestore> firestore);
34+
explicit PipelineSource(std::shared_ptr<Firestore> firestore);
3335

3436
Pipeline GetCollection(std::string collection_path) const;
3537

@@ -42,4 +44,4 @@ class PipelineSource {
4244
} // namespace firestore
4345
} // namespace firebase
4446

45-
#endif // FIREBASE_PIPELINE_SOURCE_H
47+
#endif // FIRESTORE_CORE_INTERFACEFORSWIFT_API_PIPELINE_SOURCE_H_

Firestore/core/interfaceForSwift/api/stage.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef FIREBASE_STAGE_H
16-
#define FIREBASE_STAGE_H
15+
#ifndef FIRESTORE_CORE_INTERFACEFORSWIFT_API_STAGE_H_
16+
#define FIRESTORE_CORE_INTERFACEFORSWIFT_API_STAGE_H_
1717

1818
namespace firebase {
1919
namespace firestore {
@@ -30,4 +30,4 @@ class Stage {
3030
} // namespace firestore
3131
} // namespace firebase
3232

33-
#endif // FIREBASE_STAGE_H
33+
#endif // FIRESTORE_CORE_INTERFACEFORSWIFT_API_STAGE_H_

0 commit comments

Comments
 (0)