Skip to content

Commit 15457f2

Browse files
authored
Fix FirebaseMetadataProvider under VS2015 (#7188)
1 parent 451a6c2 commit 15457f2

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Firestore/core/src/remote/firebase_metadata_provider.cc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ namespace firebase {
2020
namespace firestore {
2121
namespace remote {
2222

23-
constexpr char FirebaseMetadataProvider::kXFirebaseClientHeader[];
24-
constexpr char FirebaseMetadataProvider::kXFirebaseClientLogTypeHeader[];
25-
constexpr char FirebaseMetadataProvider::kXFirebaseGmpIdHeader[];
23+
const char FirebaseMetadataProvider::kXFirebaseClientHeader[] =
24+
"x-firebase-client";
25+
const char FirebaseMetadataProvider::kXFirebaseClientLogTypeHeader[] =
26+
"x-firebase-client-log-type";
27+
const char FirebaseMetadataProvider::kXFirebaseGmpIdHeader[] =
28+
"x-firebase-gmpid";
2629

2730
} // namespace remote
2831
} // namespace firestore

Firestore/core/src/remote/firebase_metadata_provider.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ namespace remote {
3131
*/
3232
class FirebaseMetadataProvider {
3333
public:
34-
static constexpr char kXFirebaseClientHeader[] = "x-firebase-client";
35-
static constexpr char kXFirebaseClientLogTypeHeader[] =
36-
"x-firebase-client-log-type";
37-
static constexpr char kXFirebaseGmpIdHeader[] = "x-firebase-gmpid";
34+
static const char kXFirebaseClientHeader[];
35+
static const char kXFirebaseClientLogTypeHeader[];
36+
static const char kXFirebaseGmpIdHeader[];
3837

3938
virtual ~FirebaseMetadataProvider() = default;
4039

0 commit comments

Comments
 (0)