for issue #80 : remove some warnings

NevilClavain · Jul 17, 2023 · 232fc23 · 232fc23
1 parent 6dcdfe5
commit 232fc23
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,6 +28,8 @@ set(CMAKE_CXX_STANDARD 17)
 # disable ZERO_CHECK project generation
 set(CMAKE_SUPPRESS_REGENERATION true)
 
+add_definitions(-D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS)
+
 # 3rd-parts localisations
 set(physfs_include_dir ${CMAKE_SOURCE_DIR}/thirdparts/physfs-2.0.3/sdk/include)
 set(physfs_lib_dir ${CMAKE_SOURCE_DIR}/thirdparts/physfs-2.0.3/sdk/lib/x86)

diff --git a/lua_core/src/luaclass_entity.cpp b/lua_core/src/luaclass_entity.cpp
@@ -1066,8 +1066,9 @@ int LuaClass_Entity::LUA_readmeshesfiledescription(lua_State* p_L)
 	{
 		LUA_ERROR("Entity::read_meshesfiledescription : argument(s) missing");
 	}
-	int index = luaL_checkint(p_L, 1);
-	dsstring section = luaL_checkstring(p_L, 2);
+
+	size_t index{ (size_t)luaL_checkint(p_L, 1) };
+	const dsstring section{ luaL_checkstring(p_L, 2) };
 
 	ResourcesAspect* resources_aspect = m_entity.GetAspect<ResourcesAspect>();
 	if (!resources_aspect)
@@ -1112,7 +1113,7 @@ int LuaClass_Entity::LUA_readmeshesfiledescription(lua_State* p_L)
 				LUA_ERROR("Entity::read_meshesfiledescription : argument(s) missing");
 			}
 
-			int index = luaL_checkint(p_L, 3) - 1; // lua-style index [1 to n]
+			const size_t index{ (size_t)luaL_checkint(p_L, 3) - 1 }; // lua-style index [1 to n]
 
 			if (index >= 0 && index < mesheFileDescription.meshes_descriptions.size())
 			{
@@ -1153,7 +1154,7 @@ int LuaClass_Entity::LUA_readmeshesfiledescription(lua_State* p_L)
 				LUA_ERROR("Entity::read_meshesfiledescription : argument(s) missing");
 			}
 
-			int index = luaL_checkint(p_L, 3) - 1; // lua-style index [1 to n]
+			size_t index = { (size_t)luaL_checkint(p_L, 3) - 1 }; // lua-style index [1 to n]
 
 			if (index >= 0 && index < mesheFileDescription.anims_descriptions.size())
 			{

diff --git a/lua_extensions/planets_luaext/src/lod_layer.cpp b/lua_extensions/planets_luaext/src/lod_layer.cpp
@@ -267,7 +267,7 @@ void Layer::build_meshe(float* p_heightmap, DrawSpace::Core::Meshe& p_patchmeshe
         }
     }
 
-    for (long i = 0; i < p_patchmeshe.GetTrianglesListSize(); i++)
+    for (size_t i = 0; i < p_patchmeshe.GetTrianglesListSize(); i++)
     {
         TrianglePrimitive<unsigned int> t;
         p_patchmeshe.GetTriangles(i, t);

diff --git a/lua_extensions/planets_luaext/src/luaclass_planetrendering.cpp b/lua_extensions/planets_luaext/src/luaclass_planetrendering.cpp
@@ -170,7 +170,7 @@ void LuaClass_PlanetRendering::configure_from_renderlayer(lua_State* p_L, LuaCla
     layers_fx.resize(rcfg_list_size);
     layers_textures.resize(rcfg_list_size);
 
-    for (int k = 0; k < rcfg_list_size; k++)
+    for (size_t k = 0; k < rcfg_list_size; k++)
     {
         const auto render_config{ p_lua_renderlayer->GetRenderConfig(k) };
         const auto rc_list_size{ render_config.second.render_contexts.size() };
@@ -192,7 +192,7 @@ void LuaClass_PlanetRendering::configure_from_renderlayer(lua_State* p_L, LuaCla
             const auto textures_set_size = render_context.textures_sets.size();
             // les N jeux de 32 textures stages
             std::vector<std::array<Texture*, RenderingNode::NbMaxTextures>> textures;
-            for (int texture_face_index = 0; texture_face_index < textures_set_size; texture_face_index++)
+            for (size_t texture_face_index = 0; texture_face_index < textures_set_size; texture_face_index++)
             {
                 std::array<Texture*, RenderingNode::NbMaxTextures> textures_set = { nullptr };
 

diff --git a/lua_extensions/planets_luaext/src/planetsrenderingaspectimpl.cpp b/lua_extensions/planets_luaext/src/planetsrenderingaspectimpl.cpp
@@ -1058,7 +1058,6 @@ void PlanetsRenderingAspectImpl::init_rendering_objects(void)
 
             if (LOD::cst::SurfaceLayer == layer)
             {
-                std::array<PlanetDetailsBinder*, 6> details_binders;
                 std::array<LOD::Binder*, 6> details_binders_2;
 
                 for (int orientation = 0; orientation < 6; orientation++)
@@ -1082,7 +1081,6 @@ void PlanetsRenderingAspectImpl::init_rendering_objects(void)
             }
             else if (LOD::cst::AtmosphereLayer == layer)
             {
-                std::array<PlanetDetailsBinder*, 6> atmo_binders;
                 std::array<LOD::Binder*, 6> atmo_binders_2;
 
                 for (int orientation = 0; orientation < 6; orientation++)
@@ -1096,7 +1094,6 @@ void PlanetsRenderingAspectImpl::init_rendering_objects(void)
             }
             else if (LOD::cst::FlatCloudsLayer == layer)
             {
-                std::array<PlanetDetailsBinder*, 6> flatclouds_binders;
                 std::array<LOD::Binder*, 6>         flatclouds_binders_2;
 
                 for (int orientation = 0; orientation < 6; orientation++)
@@ -1116,7 +1113,6 @@ void PlanetsRenderingAspectImpl::init_rendering_objects(void)
             }
             else if (LOD::cst::OceansLayer == layer)
             {
-                std::array<PlanetDetailsBinder*, 6> oceans_binders;
                 std::array<LOD::Binder*, 6>         oceans_binders_2;
 
                 for (int orientation = 0; orientation < 6; orientation++)

diff --git a/plugins/d3d11/src/d3d11renderer.cpp b/plugins/d3d11/src/d3d11renderer.cpp
@@ -995,7 +995,7 @@ bool D3D11Renderer::CreateLineMeshe(DrawSpace::Core::LineMeshe* p_meshe, void**
     // vertex buffer creation
     const auto v{ new d3d11vertex[nb_vertices] };
 
-    for (long i = 0; i < nb_vertices; i++)
+    for (size_t i = 0; i < nb_vertices; i++)
     {
         Core::Vertex vertex;
         meshe->GetVertex(i, vertex);
@@ -1036,7 +1036,7 @@ bool D3D11Renderer::CreateLineMeshe(DrawSpace::Core::LineMeshe* p_meshe, void**
 
     const auto t{ new d3d11line[nb_lines] };
 
-    for (long i = 0; i < nb_lines; i++)
+    for (size_t i = 0; i < nb_lines; i++)
     {
         Core::LinePrimitive<unsigned int> line;
         meshe->GetLine(i, line);

diff --git a/plugins/d3d11/src/errors.cpp b/plugins/d3d11/src/errors.cpp
@@ -25,7 +25,7 @@
 #pragma warning( disable : 4005 )
 
 #include <unordered_map>
-#include <drawspace_commons.h>
+#include <ds_types.h>
 #include <d3dx11.h>
 
 void TranslateD3DD11Error( HRESULT p_hRes, dsstring &p_str )

diff --git a/src/buildemeshetask.cpp b/src/buildemeshetask.cpp
@@ -196,7 +196,7 @@ void BuildMesheTask::build_meshe(Core::Entity* p_entity, aiNode* p_ai_node, aiMe
         //////////// transformation des normales
         auto n_transf { p_destination->GetNormalesTransf() };
 
-        for (long j = 0; j < p_destination->GetVertexListSize(); j++)
+        for (size_t j = 0; j < p_destination->GetVertexListSize(); j++)
         {
             DrawSpace::Core::Vertex vertex;
             p_destination->GetVertex(j, vertex);
@@ -294,7 +294,7 @@ void BuildMesheTask::build_meshe(Core::Entity* p_entity, aiNode* p_ai_node, aiMe
 
             //////
 
-            for (long j = 0; j < p_destination->GetVertexListSize(); j++)
+            for (size_t j = 0; j < p_destination->GetVertexListSize(); j++)
             {
                 DrawSpace::Core::Vertex vertex;
                 p_destination->GetVertex(j, vertex);

diff --git a/src/collisionaspect.cpp b/src/collisionaspect.cpp
@@ -22,6 +22,7 @@
 */
 /* -*-LIC_END-*- */
 
+#include "ds_types.h"
 #include "collisionaspect.h"
 #include "physicsaspect.h"
 #include "transformaspect.h"

diff --git a/src/ds_types.h b/src/ds_types.h
@@ -28,7 +28,7 @@
 #include <string>
 #include <exception>
 
-#pragma warning( disable : 4231 4996 4311 4800 4244 4305 4477 )
+#pragma warning( disable : 4231 4996 4311 4800 4244 4305 4477 5033)
 
 using dsstring		= std::string;
 using dswstring		= std::wstring;

diff --git a/src/hub.h b/src/hub.h
@@ -40,6 +40,7 @@ namespace DrawSpace
 {
 namespace Systems
 {
+
 class Hub : public Interface::System
 {
 public:
@@ -76,7 +77,7 @@ class Hub : public Interface::System
     dsstring GetSystemId(void) const { return "HubSystem"; };
 
 	template<typename T>
-	inline T& GetSystem(const dsstring& p_id) const
+	T& GetSystem(const dsstring& p_id) const
 	{
 		for (const auto& e : m_systems)
 		{
@@ -85,14 +86,15 @@ class Hub : public Interface::System
 				try
 				{
 					return dynamic_cast<T&>(*e);
-
 				}
 				catch (std::bad_cast& p_bc)
 				{
 					_DSEXCEPTION("bad cast : " << dsstring( p_bc.what() ) << " " << p_id.c_str());
 				}
 			}
-		}		
+		}
+
+        _DSEXCEPTION("Unknown systrm id ");
 	}
 
     void EnableGUI( bool p_state );

diff --git a/src/physicsaspect.cpp b/src/physicsaspect.cpp
@@ -22,6 +22,7 @@
 */
 /* -*-LIC_END-*- */
 
+#include "ds_types.h"
 #include "physicsaspect.h"
 #include "vector.h"
 #include "timemanager.h"

diff --git a/src/rigidbodytransformaspectimpl.cpp b/src/rigidbodytransformaspectimpl.cpp
@@ -22,6 +22,7 @@
 */
 /* -*-LIC_END-*- */
 
+#include "ds_types.h"
 #include "physicsaspect.h"
 #include "transformaspect.h"
 #include "matrix.h"