From 2e1891d28172d630400fd061f9cfce61525aa9b7 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 28 Sep 2010 11:18:21 +0200 Subject: [PATCH] Fixed: Removed dummyToAvoidStupidCompilerWarning functions to fix compilation if std*.cpp are included more than once --- code/nel/src/3d/driver/direct3d/stddirect3d.cpp | 5 ----- code/nel/src/3d/driver/opengl/stdopengl.cpp | 7 ------- code/nel/src/3d/std3d.cpp | 7 ------- code/nel/src/3d/std3d.h | 2 ++ code/nel/src/georges/stdgeorges.cpp | 7 ------- code/nel/src/georges/stdgeorges.h | 1 + code/nel/src/ligo/stdligo.cpp | 7 ------- code/nel/src/misc/stdmisc.cpp | 7 ------- code/nel/src/net/stdnet.cpp | 7 ------- code/nel/src/pacs/stdpacs.cpp | 7 ------- code/nel/src/sound/driver/fmod/stdfmod.cpp | 12 ------------ code/nel/src/sound/driver/openal/stdopenal.cpp | 7 ------- code/nel/src/sound/driver/stdsound_lowlevel.cpp | 7 ------- code/nel/src/sound/driver/xaudio2/stdxaudio2.cpp | 7 ------- code/nel/src/sound/stdsound.cpp | 7 ------- 15 files changed, 3 insertions(+), 94 deletions(-) diff --git a/code/nel/src/3d/driver/direct3d/stddirect3d.cpp b/code/nel/src/3d/driver/direct3d/stddirect3d.cpp index 99b8b90b6..e4aa743c4 100644 --- a/code/nel/src/3d/driver/direct3d/stddirect3d.cpp +++ b/code/nel/src/3d/driver/direct3d/stddirect3d.cpp @@ -15,8 +15,3 @@ // along with this program. If not, see . #include "stddirect3d.h" - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_std_direct3d_cpp() -{ -} diff --git a/code/nel/src/3d/driver/opengl/stdopengl.cpp b/code/nel/src/3d/driver/opengl/stdopengl.cpp index 4c8ee2ab1..fd5fb78c7 100644 --- a/code/nel/src/3d/driver/opengl/stdopengl.cpp +++ b/code/nel/src/3d/driver/opengl/stdopengl.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdopengl.h" - - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_stdopengl_cpp() -{ -} - diff --git a/code/nel/src/3d/std3d.cpp b/code/nel/src/3d/std3d.cpp index af5b3d147..e6d600f48 100644 --- a/code/nel/src/3d/std3d.cpp +++ b/code/nel/src/3d/std3d.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "std3d.h" - - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_std_3d_cpp() -{ -} - diff --git a/code/nel/src/3d/std3d.h b/code/nel/src/3d/std3d.h index c556132b4..9a176bd41 100644 --- a/code/nel/src/3d/std3d.h +++ b/code/nel/src/3d/std3d.h @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include "nel/misc/rgba.h" #include "nel/misc/debug.h" diff --git a/code/nel/src/georges/stdgeorges.cpp b/code/nel/src/georges/stdgeorges.cpp index 0367e0496..5724ceb3d 100644 --- a/code/nel/src/georges/stdgeorges.cpp +++ b/code/nel/src/georges/stdgeorges.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdgeorges.h" - - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_std_georges_cpp() -{ -} - diff --git a/code/nel/src/georges/stdgeorges.h b/code/nel/src/georges/stdgeorges.h index 962c06ac0..bcba05061 100644 --- a/code/nel/src/georges/stdgeorges.h +++ b/code/nel/src/georges/stdgeorges.h @@ -21,6 +21,7 @@ #include #include #include +#include #include "nel/misc/debug.h" #include "nel/misc/common.h" diff --git a/code/nel/src/ligo/stdligo.cpp b/code/nel/src/ligo/stdligo.cpp index c0f179857..1bbca7101 100644 --- a/code/nel/src/ligo/stdligo.cpp +++ b/code/nel/src/ligo/stdligo.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdligo.h" - - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_std_ligo_cpp() -{ -} - diff --git a/code/nel/src/misc/stdmisc.cpp b/code/nel/src/misc/stdmisc.cpp index 787f26559..55602d4d2 100644 --- a/code/nel/src/misc/stdmisc.cpp +++ b/code/nel/src/misc/stdmisc.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdmisc.h" - - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_std_misc_cpp() -{ -} - diff --git a/code/nel/src/net/stdnet.cpp b/code/nel/src/net/stdnet.cpp index 60caf8919..e05953289 100644 --- a/code/nel/src/net/stdnet.cpp +++ b/code/nel/src/net/stdnet.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdnet.h" - - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_stdnet_cpp() -{ -} - diff --git a/code/nel/src/pacs/stdpacs.cpp b/code/nel/src/pacs/stdpacs.cpp index ad1bcb876..2d995ede0 100644 --- a/code/nel/src/pacs/stdpacs.cpp +++ b/code/nel/src/pacs/stdpacs.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdpacs.h" - - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_stdpacs_cpp() -{ -} - diff --git a/code/nel/src/sound/driver/fmod/stdfmod.cpp b/code/nel/src/sound/driver/fmod/stdfmod.cpp index 7cfe61713..a8ce0c168 100644 --- a/code/nel/src/sound/driver/fmod/stdfmod.cpp +++ b/code/nel/src/sound/driver/fmod/stdfmod.cpp @@ -15,15 +15,3 @@ // along with this program. If not, see . #include "stdfmod.h" - - -namespace NLSOUND -{ - -void dummyToAvoidStupidVCWarning_stdfmod_cpp() -{ -} - -} // NLSOUND - -/* end of file */ diff --git a/code/nel/src/sound/driver/openal/stdopenal.cpp b/code/nel/src/sound/driver/openal/stdopenal.cpp index 80db28f09..8edf9938e 100644 --- a/code/nel/src/sound/driver/openal/stdopenal.cpp +++ b/code/nel/src/sound/driver/openal/stdopenal.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdopenal.h" - -void dummyToAvoidStupidCompilerWarning_stdopenal_cpp() -{ - -} - -/* end of file */ diff --git a/code/nel/src/sound/driver/stdsound_lowlevel.cpp b/code/nel/src/sound/driver/stdsound_lowlevel.cpp index 3f4661768..7771eab62 100644 --- a/code/nel/src/sound/driver/stdsound_lowlevel.cpp +++ b/code/nel/src/sound/driver/stdsound_lowlevel.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdsound_lowlevel.h" - - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_std_sound_lowlevel_cpp() -{ -} - diff --git a/code/nel/src/sound/driver/xaudio2/stdxaudio2.cpp b/code/nel/src/sound/driver/xaudio2/stdxaudio2.cpp index acfbf14ad..e383536b3 100644 --- a/code/nel/src/sound/driver/xaudio2/stdxaudio2.cpp +++ b/code/nel/src/sound/driver/xaudio2/stdxaudio2.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdxaudio2.h" - -void dummyToAvoidStupidCompilerWarning_stdxaudio2_cpp() -{ - -} - -/* end of file */ diff --git a/code/nel/src/sound/stdsound.cpp b/code/nel/src/sound/stdsound.cpp index 2ea5d9801..84f1a724f 100644 --- a/code/nel/src/sound/stdsound.cpp +++ b/code/nel/src/sound/stdsound.cpp @@ -15,10 +15,3 @@ // along with this program. If not, see . #include "stdsound.h" - - -// leave not static else this workaround don't work -void dummyToAvoidStupidCompilerWarning_std_sound_cpp() -{ -} -