diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-09-10 12:18:22 +0200 |
---|---|---|
committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-09-10 12:18:22 +0200 |
commit | 405738a7134610217a15fd2846191a2beea5b18b (patch) | |
tree | 20368983d4bccc39a9f03afc8e86da041412b240 | |
parent | cf4d35ca734fed4ace1949d1a1ed0336c370705b (diff) | |
download | quake-linaro_android_4.1.2.tar.gz |
quake: Fix build in ISO C++ 11 modelinaro_android_4.1.2linaro_android_4.1.1
Fixes building with -std=gnu++11 - this is useful for compatibility
with future compilers (where gnu++11 will be the default mode) and
to make additional language features/optimizations (e.g. constexpr)
available.
Change-Id: I895e19ef7443e33a1f042cda3abf588a6edc062b
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r-- | quake/src/WinQuake/common.cpp | 2 | ||||
-rw-r--r-- | quake/src/WinQuake/host.cpp | 2 | ||||
-rw-r--r-- | quake/src/WinQuake/host_cmd.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/quake/src/WinQuake/common.cpp b/quake/src/WinQuake/common.cpp index d4ea266..7ffc3b0 100644 --- a/quake/src/WinQuake/common.cpp +++ b/quake/src/WinQuake/common.cpp @@ -1807,7 +1807,7 @@ void COM_InitFilesystem (void) // // start up with GAMENAME by default (id1) // - COM_AddGameDirectory (va("%s/"GAMENAME, basedir) ); + COM_AddGameDirectory (va("%s/" GAMENAME, basedir) ); if (COM_CheckParm ("-rogue")) COM_AddGameDirectory (va("%s/rogue", basedir) ); diff --git a/quake/src/WinQuake/host.cpp b/quake/src/WinQuake/host.cpp index f1af56a..4ba1228 100644 --- a/quake/src/WinQuake/host.cpp +++ b/quake/src/WinQuake/host.cpp @@ -870,7 +870,7 @@ void Host_Init (quakeparms_t *parms) NET_Init (); SV_Init (); - Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); + Con_Printf ("Exe: " __TIME__ " " __DATE__ "\n"); Con_Printf ("%4.1f megabyte heap\n",parms->memsize/ (1024*1024.0)); R_InitTextures (); // needed even for dedicated servers diff --git a/quake/src/WinQuake/host_cmd.cpp b/quake/src/WinQuake/host_cmd.cpp index b5964f9..bcf36f8 100644 --- a/quake/src/WinQuake/host_cmd.cpp +++ b/quake/src/WinQuake/host_cmd.cpp @@ -956,7 +956,7 @@ void Host_Name_f (void) void Host_Version_f (void) { Con_Printf ("Version %4.2f\n", VERSION); - Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); + Con_Printf ("Exe: " __TIME__ " " __DATE__ "\n"); } #ifdef IDGODS |