matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: Use char* for kFileMagicValue to avoid dynamic initialization and consequent ordering problems

Browse Source
This commit is contained in:
Srivats P 2016-06-01 19:19:45 +05:30
parent bdbbd8f0a1
commit 78957a019f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/nativefileformat.cpp
View File

@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
#define tr(str) QObject::tr(str) #define tr(str) QObject::tr(str)
const std::string NativeFileFormat::kFileMagicValue = "\xa7\xb7OSTINATO"; const char* NativeFileFormat::kFileMagicValue = "\xa7\xb7OSTINATO";
static const int kBaseHex = 16; static const int kBaseHex = 16;

2
common/nativefileformat.h
View File

@ -66,7 +66,7 @@ private:
static const int kFileMagicOffset = 0; static const int kFileMagicOffset = 0;
static const int kFileMetaDataOffset = kFileMagicSize; static const int kFileMetaDataOffset = kFileMagicSize;
static const std::string kFileMagicValue; static const char* kFileMagicValue;
// Native file format version // Native file format version
static const uint kFileFormatVersionMajor = 0; static const uint kFileFormatVersionMajor = 0;