diff options
| author | degasus <wickmarkus@web.de> | 2016-05-04 23:47:23 +0200 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2016-05-05 00:22:49 +0200 |
| commit | 2030ad45772742e8de34dbc94baa9eb49a0f7335 (patch) | |
| tree | dd062b573b10147a86a2c60496c9f26f47842275 /Source/Core/Common/Version.cpp | |
| parent | dbd67c6b0642624af2451273ef76c49aff94c247 (diff) | |
SCM: Use std::string.
Those macros may be defined, or not. We should support both cases, so use std::string as it also defines the length of the string.
Diffstat (limited to 'Source/Core/Common/Version.cpp')
| -rw-r--r-- | Source/Core/Common/Version.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index 86380c4d92..8c97ed78a9 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -13,7 +13,7 @@ #define BUILD_TYPE_STR "" #endif -const char* scm_rev_str = "Dolphin " +const std::string scm_rev_str = "Dolphin " #if !SCM_IS_MASTER "[" SCM_BRANCH_STR "] " #endif @@ -25,14 +25,14 @@ const char* scm_rev_str = "Dolphin " #endif #ifdef _WIN32 -const char* netplay_dolphin_ver = SCM_DESC_STR " Win"; +const std::string netplay_dolphin_ver = SCM_DESC_STR " Win"; #elif __APPLE__ -const char* netplay_dolphin_ver = SCM_DESC_STR " Mac"; +const std::string netplay_dolphin_ver = SCM_DESC_STR " Mac"; #else -const char* netplay_dolphin_ver = SCM_DESC_STR " Lin"; +const std::string netplay_dolphin_ver = SCM_DESC_STR " Lin"; #endif -const char* scm_rev_git_str = SCM_REV_STR; +const std::string scm_rev_git_str = SCM_REV_STR; -const char* scm_desc_str = SCM_DESC_STR; -const char* scm_branch_str = SCM_BRANCH_STR; +const std::string scm_desc_str = SCM_DESC_STR; +const std::string scm_branch_str = SCM_BRANCH_STR; |