From f1c8d140aaaf5bf510040c4cb505284bcf7faf93 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 28 Sep 2010 11:25:37 +0200 Subject: [PATCH] Fixed: Removed dummyToAvoidStupidCompilerWarning functions to fix compilation if std*.cpp are included more than once --- code/nel/src/sound/driver/dsound/stddsound.cpp | 6 ------ code/ryzom/common/src/game_share/stdpch.cpp | 3 --- code/ryzom/server/src/entities_game_service/stdpch.cpp | 4 ---- code/ryzom/server/src/mail_forum_service/stdpch.cpp | 4 ---- code/ryzom/server/src/monitor_service/stdpch.cpp | 4 ---- code/ryzom/server/src/server_share/stdpch.cpp | 3 --- code/ryzom/server/src/server_share/stdpch.h | 1 + 7 files changed, 1 insertion(+), 24 deletions(-) diff --git a/code/nel/src/sound/driver/dsound/stddsound.cpp b/code/nel/src/sound/driver/dsound/stddsound.cpp index 9023864fd..c10382dab 100644 --- a/code/nel/src/sound/driver/dsound/stddsound.cpp +++ b/code/nel/src/sound/driver/dsound/stddsound.cpp @@ -15,9 +15,3 @@ // along with this program. If not, see . #include "stddsound.h" - - -// Foo function to remove disabled warning -void foo_stddsound() {} - -/* end of file */ diff --git a/code/ryzom/common/src/game_share/stdpch.cpp b/code/ryzom/common/src/game_share/stdpch.cpp index 57af9fb08..d4b14ffe2 100644 --- a/code/ryzom/common/src/game_share/stdpch.cpp +++ b/code/ryzom/common/src/game_share/stdpch.cpp @@ -15,6 +15,3 @@ // along with this program. If not, see . #include "stdpch.h" - -// correct the warning disabling bug in visual -void game_share_foo() {} diff --git a/code/ryzom/server/src/entities_game_service/stdpch.cpp b/code/ryzom/server/src/entities_game_service/stdpch.cpp index 908e8d559..d4b14ffe2 100644 --- a/code/ryzom/server/src/entities_game_service/stdpch.cpp +++ b/code/ryzom/server/src/entities_game_service/stdpch.cpp @@ -15,7 +15,3 @@ // along with this program. If not, see . #include "stdpch.h" - - -// correct the silly waring of VC6 -void foo_stdpch_entity_game_service() {} diff --git a/code/ryzom/server/src/mail_forum_service/stdpch.cpp b/code/ryzom/server/src/mail_forum_service/stdpch.cpp index 4814923c8..d4b14ffe2 100644 --- a/code/ryzom/server/src/mail_forum_service/stdpch.cpp +++ b/code/ryzom/server/src/mail_forum_service/stdpch.cpp @@ -15,7 +15,3 @@ // along with this program. If not, see . #include "stdpch.h" - - -// remove stupid VC 6 warnings -void foo_mail_forum_service() {} diff --git a/code/ryzom/server/src/monitor_service/stdpch.cpp b/code/ryzom/server/src/monitor_service/stdpch.cpp index 4db54c47c..d4b14ffe2 100644 --- a/code/ryzom/server/src/monitor_service/stdpch.cpp +++ b/code/ryzom/server/src/monitor_service/stdpch.cpp @@ -15,7 +15,3 @@ // along with this program. If not, see . #include "stdpch.h" - - -// Function to corret silly warning in Visual 6 -void foo_monitor_service() {}; diff --git a/code/ryzom/server/src/server_share/stdpch.cpp b/code/ryzom/server/src/server_share/stdpch.cpp index 5beb6eaa1..d4b14ffe2 100644 --- a/code/ryzom/server/src/server_share/stdpch.cpp +++ b/code/ryzom/server/src/server_share/stdpch.cpp @@ -15,6 +15,3 @@ // along with this program. If not, see . #include "stdpch.h" - -// correct the warning disabling bug in visual -void game_share_foo() {}; diff --git a/code/ryzom/server/src/server_share/stdpch.h b/code/ryzom/server/src/server_share/stdpch.h index 08c66cb76..2a4418a54 100644 --- a/code/ryzom/server/src/server_share/stdpch.h +++ b/code/ryzom/server/src/server_share/stdpch.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include