From 7521923c95000dd6b7815b2d4190d05660555fd3 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 24 Sep 2010 11:03:56 +0200 Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom --- code/nel/include/nel/georges/u_form_elm.h | 1 + code/nel/samples/misc/types_check/main.cpp | 1 - code/ryzom/client/src/interface_v3/view_renderer.cpp | 2 +- code/ryzom/client/src/login_patch.h | 2 +- code/ryzom/server/src/server_share/basic_effect.h | 2 +- code/ryzom/tools/leveldesign/prim_export/main.cpp | 2 +- code/ryzom/tools/server/build_world_packed_col/village.cpp | 7 +++---- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/nel/include/nel/georges/u_form_elm.h b/code/nel/include/nel/georges/u_form_elm.h index dd72487e2..27080b7cf 100644 --- a/code/nel/include/nel/georges/u_form_elm.h +++ b/code/nel/include/nel/georges/u_form_elm.h @@ -226,6 +226,7 @@ public: /// Returns the type of the atom. NULL otherwise. virtual const class UType *getType () = 0; + /// Return true if the element is an atom virtual bool isAtom () const = 0; diff --git a/code/nel/samples/misc/types_check/main.cpp b/code/nel/samples/misc/types_check/main.cpp index 6266765a5..3ad93b8b0 100644 --- a/code/nel/samples/misc/types_check/main.cpp +++ b/code/nel/samples/misc/types_check/main.cpp @@ -66,7 +66,6 @@ template bool check (T value) void checkInts () { - checkInt (uint8, 0, 255, 1); checkInt (sint8, -128, 127, 1); diff --git a/code/ryzom/client/src/interface_v3/view_renderer.cpp b/code/ryzom/client/src/interface_v3/view_renderer.cpp index 490c63399..17bfa99a3 100644 --- a/code/ryzom/client/src/interface_v3/view_renderer.cpp +++ b/code/ryzom/client/src/interface_v3/view_renderer.cpp @@ -553,7 +553,7 @@ void CViewRenderer::drawQuad(sint layerId, const NLMISC::CQuadUV &quadUV, sint32 { // Partially clipped (slowest case) // Must do the clip manually - const uint maxNumCorners = 8; + static const uint maxNumCorners = 8; // static CVector outPos0[maxNumCorners]; static CUV outUV0[maxNumCorners]; diff --git a/code/ryzom/client/src/login_patch.h b/code/ryzom/client/src/login_patch.h index 162765fc9..3e6abc8cf 100644 --- a/code/ryzom/client/src/login_patch.h +++ b/code/ryzom/client/src/login_patch.h @@ -612,4 +612,4 @@ private: #endif // CL_PATCH_H -/* End of login_patch.h */ \ No newline at end of file +/* End of login_patch.h */ diff --git a/code/ryzom/server/src/server_share/basic_effect.h b/code/ryzom/server/src/server_share/basic_effect.h index 75e6a4803..15feb95d4 100644 --- a/code/ryzom/server/src/server_share/basic_effect.h +++ b/code/ryzom/server/src/server_share/basic_effect.h @@ -35,7 +35,7 @@ class CBasicEffect public: /// Constructor CBasicEffect(EFFECT_FAMILIES::TEffectFamily family, const TDataSetRow & creatorId, const TDataSetRow & targetRowId) - : _CreatorRowId(creatorId), _TargetRowId(targetRowId), _Family(family) + : _CreatorRowId(creatorId), _TargetRowId(targetRowId), _Family(family), _EffectId(0) { _EffectId = ++_EffectCounter; } diff --git a/code/ryzom/tools/leveldesign/prim_export/main.cpp b/code/ryzom/tools/leveldesign/prim_export/main.cpp index 4e96e30f4..44f377575 100644 --- a/code/ryzom/tools/leveldesign/prim_export/main.cpp +++ b/code/ryzom/tools/leveldesign/prim_export/main.cpp @@ -77,7 +77,7 @@ using namespace NLLIGO; #define BAR_LENGTH 21 -char *progressbar[BAR_LENGTH]= +const char *progressbar[BAR_LENGTH]= { "[ ]", "[. ]", diff --git a/code/ryzom/tools/server/build_world_packed_col/village.cpp b/code/ryzom/tools/server/build_world_packed_col/village.cpp index 01cd37c7d..d4495a9d9 100644 --- a/code/ryzom/tools/server/build_world_packed_col/village.cpp +++ b/code/ryzom/tools/server/build_world_packed_col/village.cpp @@ -14,7 +14,8 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -/*#include "std_header.h" +#if 0 +#include "std_header.h" // #include "village.h" #include "zone_util.h" @@ -300,6 +301,4 @@ void CIGInfo::load(TShapeCache &shapeCache) } } - - -*/ \ No newline at end of file +#endif