From 182a79f2cbc1f36c5bdce47f2259b75bc2b82f05 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 25 Sep 2012 13:20:25 +0200 Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom --- .../3d/object_viewer_qt/src/plugins/example/qnel_widget.cpp | 2 +- code/ryzom/client/src/interface_v3/interface_expr.cpp | 4 ++-- code/ryzom/common/src/game_share/dms.h | 2 +- code/ryzom/tools/assoc_mem/value.h | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.cpp index 4872923db..d512521f7 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/qnel_widget.cpp @@ -60,7 +60,7 @@ QNLWidget::~QNLWidget() void QNLWidget::init() { // create the driver - m_driver = NL3D::UDriver::createDriver(NULL, false, NULL); + m_driver = NL3D::UDriver::createDriver(0, false); nlassert(m_driver); // initialize the nel 3d viewport diff --git a/code/ryzom/client/src/interface_v3/interface_expr.cpp b/code/ryzom/client/src/interface_v3/interface_expr.cpp index 656c0f642..91a6cb7f3 100644 --- a/code/ryzom/client/src/interface_v3/interface_expr.cpp +++ b/code/ryzom/client/src/interface_v3/interface_expr.cpp @@ -78,11 +78,11 @@ CInterfaceExprNode *CInterfaceExpr::buildExprTree(const std::string &expr) { std::string tempStr; formatLuaCall(expr, tempStr); - if (buildExprTree(tempStr.c_str(), node) == NULL) return false; + if (buildExprTree(tempStr.c_str(), node) == NULL) return NULL; } else { - if (buildExprTree(expr.c_str(), node) == NULL) return false; + if (buildExprTree(expr.c_str(), node) == NULL) return NULL; } return node; diff --git a/code/ryzom/common/src/game_share/dms.h b/code/ryzom/common/src/game_share/dms.h index 149c626c8..b53b8626d 100644 --- a/code/ryzom/common/src/game_share/dms.h +++ b/code/ryzom/common/src/game_share/dms.h @@ -148,7 +148,7 @@ namespace R2 public: CDynamicMapService( NLMISC::CConfigFile& confFile, NLNET::IModuleSocket * gateway); - ~CDynamicMapService(); + virtual ~CDynamicMapService(); static CDynamicMapService* getInstance(); diff --git a/code/ryzom/tools/assoc_mem/value.h b/code/ryzom/tools/assoc_mem/value.h index 321d47a14..96f0fed46 100644 --- a/code/ryzom/tools/assoc_mem/value.h +++ b/code/ryzom/tools/assoc_mem/value.h @@ -21,6 +21,8 @@ class IValue { public: + virtual ~IValue() { } + virtual void getValue(IValue &) = 0; virtual void setValue(IValue &) = 0;