Bugfix: Use char* for kFileMagicValue to avoid dynamic initialization and consequent ordering problems
This commit is contained in:
parent
bdbbd8f0a1
commit
78957a019f
@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
|
||||
#define tr(str) QObject::tr(str)
|
||||
|
||||
const std::string NativeFileFormat::kFileMagicValue = "\xa7\xb7OSTINATO";
|
||||
const char* NativeFileFormat::kFileMagicValue = "\xa7\xb7OSTINATO";
|
||||
|
||||
static const int kBaseHex = 16;
|
||||
|
||||
|
@ -66,7 +66,7 @@ private:
|
||||
static const int kFileMagicOffset = 0;
|
||||
static const int kFileMetaDataOffset = kFileMagicSize;
|
||||
|
||||
static const std::string kFileMagicValue;
|
||||
static const char* kFileMagicValue;
|
||||
|
||||
// Native file format version
|
||||
static const uint kFileFormatVersionMajor = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user