diff options
| author |  Gil <mcg@google.com> | 2018-02-22 08:12:54 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-22 08:12:54 -0800 |
| commit | 935f3ca7d749f96c7207236a39c57f32a02c05d3 (patch) | |
| tree | 94ac8094c8d10893f137325d5dc820e759dc6f90 /Firestore/core/src/firebase/firestore/model | |
| parent | 6ce954a791a73abc8d32765e2695ed153e120c47 (diff) | |
Avoid wrapping and rewrapping NSStrings when constructing DatabaseId (#833)
* Avoid wrapping and rewrapping NSStrings when constructing DatabaseId
* Shorten DatabaseId::kDefaultDatabaseId
Diffstat (limited to 'Firestore/core/src/firebase/firestore/model')
| -rw-r--r-- | Firestore/core/src/firebase/firestore/model/database_id.cc | 2 | ||||
| -rw-r--r-- | Firestore/core/src/firebase/firestore/model/database_id.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Firestore/core/src/firebase/firestore/model/database_id.cc b/Firestore/core/src/firebase/firestore/model/database_id.cc index d7e8a85..a756ea7 100644 --- a/Firestore/core/src/firebase/firestore/model/database_id.cc +++ b/Firestore/core/src/firebase/firestore/model/database_id.cc @@ -22,7 +22,7 @@ namespace firebase { namespace firestore { namespace model { -constexpr const char* DatabaseId::kDefaultDatabaseId; +constexpr const char* DatabaseId::kDefault; DatabaseId::DatabaseId(const absl::string_view project_id, const absl::string_view database_id) diff --git a/Firestore/core/src/firebase/firestore/model/database_id.h b/Firestore/core/src/firebase/firestore/model/database_id.h index 648f982..01ccf76 100644 --- a/Firestore/core/src/firebase/firestore/model/database_id.h +++ b/Firestore/core/src/firebase/firestore/model/database_id.h @@ -31,7 +31,7 @@ namespace model { class DatabaseId { public: /** The default name for "unset" database ID in resource names. */ - static constexpr const char* kDefaultDatabaseId = "(default)"; + static constexpr const char* kDefault = "(default)"; #if defined(__OBJC__) // For objective-c++ initialization; to be removed after migration. @@ -58,7 +58,7 @@ class DatabaseId { /** Whether this is the default database of the project. */ bool IsDefaultDatabase() const { - return database_id_ == kDefaultDatabaseId; + return database_id_ == kDefault; } #if defined(__OBJC__) |