From 05006d9c2cb832ddd8fbb61f4ebc6d71c5c77b4e Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 29 Sep 2010 10:20:09 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- code/ryzom/server/src/ai_service/ai_bot_pet.h | 2 ++ code/ryzom/server/src/ai_service/ai_player.h | 2 ++ code/ryzom/server/src/ai_service/list_link.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/code/ryzom/server/src/ai_service/ai_bot_pet.h b/code/ryzom/server/src/ai_service/ai_bot_pet.h index caaf83d0c..34eacd039 100644 --- a/code/ryzom/server/src/ai_service/ai_bot_pet.h +++ b/code/ryzom/server/src/ai_service/ai_bot_pet.h @@ -14,7 +14,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +#ifdef NL_OS_WINDOWS #pragma warning (disable : 4355) // warning C4355: 'this' : used in base member initializer list +#endif // NL_OS_WINDOWS #ifndef RYAI_BOT_PET_H #define RYAI_BOT_PET_H diff --git a/code/ryzom/server/src/ai_service/ai_player.h b/code/ryzom/server/src/ai_service/ai_player.h index 65dbb1dbc..430396b16 100644 --- a/code/ryzom/server/src/ai_service/ai_player.h +++ b/code/ryzom/server/src/ai_service/ai_player.h @@ -29,7 +29,9 @@ class CFauna; +#ifdef NL_OS_WINDOWS #pragma warning (disable : 4355) +#endif // NL_OS_WINDOWS ////////////////////////////////////////////////////////////////////////////// // CBotPlayer // diff --git a/code/ryzom/server/src/ai_service/list_link.h b/code/ryzom/server/src/ai_service/list_link.h index ffb5fbcdb..617d1b7cb 100644 --- a/code/ryzom/server/src/ai_service/list_link.h +++ b/code/ryzom/server/src/ai_service/list_link.h @@ -26,7 +26,9 @@ // The only valid constructor requires a pointer to the parent class that the // list link represents +#ifdef NL_OS_WINDOWS #pragma warning (disable : 4355) +#endif // NL_OS_WINDOWS template class CListLink