flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 19:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T203, fixed gcc issue

Browse Source 
static const CPlatform &linux()
platform.h:129:33: error: expected unqualified-id before numeric constant
This commit is contained in:
Klaus Basan
2017-12-12 22:25:45 +01:00
parent 9cc38c7f39
commit a4d4bd7056
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/platform.cpp
View File

@@ -151,10 +151,10 @@ namespace BlackMisc
{ {
switch (stringToPlatform(str)) switch (stringToPlatform(str))
{ {
case Win32: return CPlatform::win32(); case Win32: return CPlatform::win32Platform();
case Win64: return CPlatform::win64(); case Win64: return CPlatform::win64Platform();
case Linux: return CPlatform::linux(); case Linux: return CPlatform::linuxPlatform();
case MacOS: return CPlatform::macOS(); case MacOS: return CPlatform::macOSPlatform();
default: break; default: break;
} }
return unknownOs(); return unknownOs();
@@ -167,11 +167,11 @@ namespace BlackMisc
if (CBuildConfig::isRunningOnWindowsNtPlatform()) if (CBuildConfig::isRunningOnWindowsNtPlatform())
{ {
const int wordSize = CBuildConfig::buildWordSize(); const int wordSize = CBuildConfig::buildWordSize();
return wordSize == 64 ? CPlatform::win64() : CPlatform::win32(); return wordSize == 64 ? CPlatform::win64Platform() : CPlatform::win32Platform();
} }
if (CBuildConfig::isRunningOnLinuxPlatform()) { return CPlatform::linux(); } if (CBuildConfig::isRunningOnLinuxPlatform()) { return CPlatform::linuxPlatform(); }
if (CBuildConfig::isRunningOnMacOSPlatform()) { return CPlatform::macOS(); } if (CBuildConfig::isRunningOnMacOSPlatform()) { return CPlatform::macOSPlatform(); }
return CPlatform::unknownOs(); return CPlatform::unknownOs();
} }
} }
@@ -182,25 +182,25 @@ namespace BlackMisc
return p; return p;
} }
const CPlatform &CPlatform::win32() const CPlatform &CPlatform::win32Platform()
{ {
static const CPlatform p(Win32); static const CPlatform p(Win32);
return p; return p;
} }
const CPlatform &CPlatform::win64() const CPlatform &CPlatform::win64Platform()
{ {
static const CPlatform p(Win64); static const CPlatform p(Win64);
return p; return p;
} }
const CPlatform &CPlatform::linux() const CPlatform &CPlatform::linuxPlatform()
{ {
static const CPlatform p(Linux); static const CPlatform p(Linux);
return p; return p;
} }
const CPlatform &CPlatform::macOS() const CPlatform &CPlatform::macOSPlatform()
{ {
static const CPlatform p(MacOS); static const CPlatform p(MacOS);
return p; return p;

8
src/blackmisc/platform.h
View File

@@ -120,16 +120,16 @@ namespace BlackMisc
static const CPlatform &currentPlatform(); static const CPlatform &currentPlatform();
//! Win32 //! Win32
static const CPlatform &win32(); static const CPlatform &win32Platform();
//! Win64 //! Win64
static const CPlatform &win64(); static const CPlatform &win64Platform();
//! Linux //! Linux
static const CPlatform &linux(); static const CPlatform &linuxPlatform();
//! Mac OS //! Mac OS
static const CPlatform &macOS(); static const CPlatform &macOSPlatform();
//! Unknown OS //! Unknown OS
static const CPlatform &unknownOs(); static const CPlatform &unknownOs();

2
src/blackmisc/platformset.cpp
View File

@@ -63,7 +63,7 @@ namespace BlackMisc
const CPlatformSet &CPlatformSet::allPlatforms() const CPlatformSet &CPlatformSet::allPlatforms()
{ {
static const CPlatformSet platforms({ CPlatform::win32(), CPlatform::win64(), CPlatform::linux(), CPlatform::macOS() }); static const CPlatformSet platforms({ CPlatform::win32Platform(), CPlatform::win64Platform(), CPlatform::linuxPlatform(), CPlatform::macOSPlatform() });
return platforms; return platforms;
} }