Merge pull request #73 from eclipse-zenoh/warning_fixed

old style type cast warning fixed
eclipse-zenoh · Sep 25, 2023 · d3f927d · d3f927d
2 parents 9fec0f4 + eb84172
commit d3f927d
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 17 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -31,17 +31,6 @@ function(add_example file mode lib)
     target_link_libraries(${target} PUBLIC ${lib})
 	set_property(TARGET ${target} PROPERTY LANGUAGE CXX)
 	set_property(TARGET ${target} PROPERTY CXX_STANDARD 17)
-
-	# Enable all warnings and treat warnings as errors only when building examples.
-	# Supposedly, enabling it for examples only, but not for the library target itself 
-	# is a good compromise. It guarantees the continuous checking the code and do not
-	# breaks dependent projects if warnings are mistakenly introduced in the library.	
-	if(MSVC)
-		target_compile_options(${target} PRIVATE /W4 /WX)
-	else()
-		target_compile_options(${target} PRIVATE -Wall -Wextra -Wpedantic -Werror)
-	endif()
-
 endfunction()
 
 function(add_examples glob mode lib)

diff --git a/examples/simple/universal/build/_deps/cpp_wrapper-src b/examples/simple/universal/build/_deps/cpp_wrapper-src
diff --git a/examples/simple/universal/build/_deps/zenohc_backend-src b/examples/simple/universal/build/_deps/zenohc_backend-src
diff --git a/examples/simple/universal/build/_deps/zenohpico_backend-src b/examples/simple/universal/build/_deps/zenohpico_backend-src
diff --git a/include/zenohcxx/impl.hxx b/include/zenohcxx/impl.hxx
@@ -39,7 +39,7 @@ inline ::z_bytes_t z::BytesView::init(const uint8_t* start, size_t len) {
 
 inline std::ostream& operator<<(std::ostream& os, const z::Id& id) {
     for (size_t i = 0; id.id[i] != 0 && i < 16; i++)
-        os << std::hex << std::setfill('0') << std::setw(2) << (int)id.id[i];
+        os << std::hex << std::setfill('0') << std::setw(2) << static_cast<int>(id.id[i]);
     return os;
 }
 

diff --git a/include/zenohpico.hxx b/include/zenohpico.hxx
@@ -16,8 +16,6 @@
 #define __ZENOHCXX_ZENOHPICO
 #undef __ZENOHCXX_ZENOHC
 
-typedef bool _Bool;
-
 #include "zenoh-pico.h"
 #include "zenohcxx/base.hxx"
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -34,3 +34,24 @@ foreach(file ${files})
     add_test_instance(${file} zenohpico zenohcxx::zenohpico)
 endforeach()
 
+function(set_strict_warnings file mode)
+	get_filename_component(filename ${file} NAME_WE)
+	set(target ${filename}_${mode})
+	# Enable all warnings and treat warnings as errors
+	# to check that library can be built in maximally strict mode
+	if(MSVC)
+		target_compile_options(${target} PRIVATE /W4 /WX)
+	else()
+		target_compile_options(${target} PRIVATE 
+			-Wall 
+			-Wextra 
+			-Wpedantic
+			-Wold-style-cast 
+			-Werror)
+	endif()
+endfunction()
+
+add_test_instance(${CMAKE_CURRENT_SOURCE_DIR}/build/warnings.cxx zenohc zenohcxx::zenohc::static)
+add_test_instance(${CMAKE_CURRENT_SOURCE_DIR}/build/warnings.cxx zenohpico zenohcxx::zenohpico)
+set_strict_warnings(${CMAKE_CURRENT_SOURCE_DIR}/build/warnings.hxx zenohc)
+set_strict_warnings(${CMAKE_CURRENT_SOURCE_DIR}/build/warnings.hxx zenohpico)
diff --git a/tests/build/warnings.cxx b/tests/build/warnings.cxx
@@ -0,0 +1,30 @@
+//
+// Copyright (c) 2023 ZettaScale Technology
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+//
+// Contributors:
+//   ZettaScale Zenoh Team, <[email protected]>
+//
+
+// Disable 'old-style-cast` warning for C headers only
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#ifdef ZENOHCXX_ZENOHPICO
+#include "zenoh-pico.h"
+#endif
+#ifdef ZENOHCXX_ZENOHC
+#include "zenoh.h"
+#endif
+#pragma GCC diagnostic pop
+
+#include "zenoh.hxx"
+
+using namespace zenoh;
+
+int main() { return 0; }