From fac29f77f3fb81694fae60b5e0796141baa946ad Mon Sep 17 00:00:00 2001 From: owent Date: Wed, 22 Mar 2023 18:34:35 +0800 Subject: [PATCH 1/3] Ignore more warning of generated protobuf files than not included in `-Wall` and `-Wextra` Signed-off-by: owent --- .../exporters/otlp/protobuf_include_prefix.h | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h index 036cb0ae7f..75893d40d1 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h @@ -22,6 +22,9 @@ # pragma warning(disable : 4267) # pragma warning(disable : 4668) # pragma warning(disable : 4946) +# pragma warning(disable : 6001) +# pragma warning(disable : 6244) +# pragma warning(disable : 6246) #endif #if defined(__GNUC__) && !defined(__clang__) && !defined(__apple_build_version__) @@ -30,9 +33,32 @@ # endif # pragma GCC diagnostic ignored "-Wunused-parameter" # pragma GCC diagnostic ignored "-Wtype-limits" +# pragma GCC diagnostic ignored "-Wsign-compare" +# pragma GCC diagnostic ignored "-Wsign-conversion" +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wuninitialized" +# pragma GCC diagnostic ignored "-Wconversion" +# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 409 +# pragma GCC diagnostic ignored "-Wfloat-conversion" +# endif +# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 501 +# pragma GCC diagnostic ignored "-Wsuggest-override" +# endif #elif defined(__clang__) || defined(__apple_build_version__) # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wunused-parameter" # pragma clang diagnostic ignored "-Wtype-limits" # pragma clang diagnostic ignored "-Wshadow-field" +# pragma clang diagnostic ignored "-Wsign-compare" +# pragma clang diagnostic ignored "-Wsign-conversion" +# pragma clang diagnostic ignored "-Wshadow" +# pragma clang diagnostic ignored "-Wuninitialized" +# pragma clang diagnostic ignored "-Wconversion" +# if !(((__clang_major__ * 100) + __clang_minor__) >= 305) +# pragma GCC diagnostic ignored "-Wsuggest-override" +# pragma GCC diagnostic ignored "-Winconsistent-missing-override" +# endif +# if !(((__clang_major__ * 100) + __clang_minor__) >= 309) +# pragma GCC diagnostic ignored "-Wfloat-conversion" +# endif #endif From 7be063940a24e5098cf47791c5bf11e74bd6cfe3 Mon Sep 17 00:00:00 2001 From: owent Date: Thu, 23 Mar 2023 09:48:57 +0800 Subject: [PATCH 2/3] Fix clang diagnostic pragma Signed-off-by: owent --- .../opentelemetry/exporters/otlp/protobuf_include_prefix.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h index 75893d40d1..5431a5bdf7 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h @@ -55,10 +55,10 @@ # pragma clang diagnostic ignored "-Wuninitialized" # pragma clang diagnostic ignored "-Wconversion" # if !(((__clang_major__ * 100) + __clang_minor__) >= 305) -# pragma GCC diagnostic ignored "-Wsuggest-override" -# pragma GCC diagnostic ignored "-Winconsistent-missing-override" +# pragma clang diagnostic ignored "-Wsuggest-override" +# pragma clang diagnostic ignored "-Winconsistent-missing-override" # endif # if !(((__clang_major__ * 100) + __clang_minor__) >= 309) -# pragma GCC diagnostic ignored "-Wfloat-conversion" +# pragma clang diagnostic ignored "-Wfloat-conversion" # endif #endif From 3eb7b5e53fe6f1085de8ab37af9bfb841c478e4c Mon Sep 17 00:00:00 2001 From: owent Date: Thu, 23 Mar 2023 21:00:26 +0800 Subject: [PATCH 3/3] Fix clang diagnostic versions. Signed-off-by: owent --- .../exporters/otlp/protobuf_include_prefix.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h index 5431a5bdf7..dc674ce9eb 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/protobuf_include_prefix.h @@ -54,11 +54,13 @@ # pragma clang diagnostic ignored "-Wshadow" # pragma clang diagnostic ignored "-Wuninitialized" # pragma clang diagnostic ignored "-Wconversion" -# if !(((__clang_major__ * 100) + __clang_minor__) >= 305) -# pragma clang diagnostic ignored "-Wsuggest-override" +# if ((__clang_major__ * 100) + __clang_minor__) >= 305 +# pragma clang diagnostic ignored "-Wfloat-conversion" +# endif +# if ((__clang_major__ * 100) + __clang_minor__) >= 306 # pragma clang diagnostic ignored "-Winconsistent-missing-override" # endif -# if !(((__clang_major__ * 100) + __clang_minor__) >= 309) -# pragma clang diagnostic ignored "-Wfloat-conversion" +# if ((__clang_major__ * 100) + __clang_minor__) >= 1100 +# pragma clang diagnostic ignored "-Wsuggest-override" # endif #endif