Skip to content

Commit 93b0c7c

Browse files
edwardbrclaude
andcommitted
Fix pragma compilation errors in generator
Corrected pragma directives around args.hxx include in generator/src/main.cpp. Changed from chained _Pragma directives to proper #pragma syntax, fixed warning name from -Wno-gnu-zero-variadic-macro-arguments to -Wgnu-zero-variadic-macro-arguments, and added GCC compiler support alongside Clang. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 823d873 commit 93b0c7c

File tree

10 files changed

+116
-7
lines changed

10 files changed

+116
-7
lines changed

cmake/Linux.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ set(CANOPY_WARN_PEDANTIC
136136
-DCANOPY_WARN_PEDANTIC
137137
${CANOPY_WARN_BASELINE}
138138
-Wpedantic # be pedantic
139-
-Wsign-conversion # Warn on implicit sign conversions
140-
-Wconversion # Warn on implicit type conversions
139+
# -Wsign-conversion # Warn on implicit sign conversions -Wconversion # Warn on implicit type conversions
141140
-Wfloat-conversion # Warn on float conversions
142141
-Wdouble-promotion # Warn when float promoted to double
143142
)

demos/websocket/server/demo.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ namespace websocket_demo
2121
return nullptr;
2222
}
2323

24-
CORO_TASK(int) add(double first_val, double second_val, double& response)
24+
CORO_TASK(int) add(double first_val, double second_val, double& response) override
2525
{
2626
response = first_val + second_val;
2727
CO_RETURN rpc::error::OK();
2828
}
29-
CORO_TASK(int) subtract(double first_val, double second_val, double& response)
29+
CORO_TASK(int) subtract(double first_val, double second_val, double& response) override
3030
{
3131
response = first_val - second_val;
3232
CO_RETURN rpc::error::OK();
3333
}
34-
CORO_TASK(int) multiply(double first_val, double second_val, double& response)
34+
CORO_TASK(int) multiply(double first_val, double second_val, double& response) override
3535
{
3636
response = first_val * second_val;
3737
CO_RETURN rpc::error::OK();
3838
}
39-
CORO_TASK(int) divide(double first_val, double second_val, double& response)
39+
CORO_TASK(int) divide(double first_val, double second_val, double& response) override
4040
{
4141
response = first_val / second_val;
4242
CO_RETURN rpc::error::OK();

generator/src/main.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,23 @@
99
#include <filesystem>
1010
#include <fstream>
1111

12+
#ifdef __clang__
13+
#pragma clang diagnostic push
14+
#pragma clang diagnostic ignored "-Wsuggest-override"
15+
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
16+
#elif defined(__GNUC__)
17+
#pragma GCC diagnostic push
18+
#pragma GCC diagnostic ignored "-Wsuggest-override"
19+
#endif
20+
1221
#include <args.hxx>
1322

23+
#ifdef __clang__
24+
#pragma clang diagnostic pop
25+
#elif defined(__GNUC__)
26+
#pragma GCC diagnostic pop
27+
#endif
28+
1429
#include "commonfuncs.h"
1530
#include "macro_parser.h"
1631

submodules/yas

tests/fuzz_test/fuzz_test_main.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,23 @@
3131
#endif
3232

3333
// Other headers
34+
#ifdef __clang__
35+
#pragma clang diagnostic push
36+
#pragma clang diagnostic ignored "-Wsuggest-override"
37+
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
38+
#elif defined(__GNUC__)
39+
#pragma GCC diagnostic push
40+
#pragma GCC diagnostic ignored "-Wsuggest-override"
41+
#endif
42+
3443
#include <args.hxx>
44+
45+
#ifdef __clang__
46+
#pragma clang diagnostic pop
47+
#elif defined(__GNUC__)
48+
#pragma GCC diagnostic pop
49+
#endif
50+
3551
#include <spdlog/spdlog.h>
3652
#include <yas/types/std/string.hpp>
3753
#include <yas/types/std/vector.hpp>

tests/test_host/hierachical_transport_tests.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,23 @@
2020
#endif
2121

2222
// Other headers
23+
#ifdef __clang__
24+
#pragma clang diagnostic push
25+
#pragma clang diagnostic ignored "-Wsuggest-override"
26+
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
27+
#elif defined(__GNUC__)
28+
#pragma GCC diagnostic push
29+
#pragma GCC diagnostic ignored "-Wsuggest-override"
30+
#endif
31+
2332
#include <args.hxx>
33+
34+
#ifdef __clang__
35+
#pragma clang diagnostic pop
36+
#elif defined(__GNUC__)
37+
#pragma GCC diagnostic pop
38+
#endif
39+
2440
#ifdef CANOPY_BUILD_COROUTINE
2541
#include <coro/io_scheduler.hpp>
2642
#endif

tests/test_host/main.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,23 @@
33
* All rights reserved.
44
*/
55

6+
#ifdef __clang__
7+
#pragma clang diagnostic push
8+
#pragma clang diagnostic ignored "-Wsuggest-override"
9+
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
10+
#elif defined(__GNUC__)
11+
#pragma GCC diagnostic push
12+
#pragma GCC diagnostic ignored "-Wsuggest-override"
13+
#endif
14+
615
#include <args.hxx>
716

17+
#ifdef __clang__
18+
#pragma clang diagnostic pop
19+
#elif defined(__GNUC__)
20+
#pragma GCC diagnostic pop
21+
#endif
22+
823
#include "gmock/gmock.h"
924
#include "gtest/gtest.h"
1025

tests/test_host/post_functionality_test_suite.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,23 @@
2121
#endif
2222

2323
// Other headers
24+
#ifdef __clang__
25+
#pragma clang diagnostic push
26+
#pragma clang diagnostic ignored "-Wsuggest-override"
27+
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
28+
#elif defined(__GNUC__)
29+
#pragma GCC diagnostic push
30+
#pragma GCC diagnostic ignored "-Wsuggest-override"
31+
#endif
32+
2433
#include <args.hxx>
34+
35+
#ifdef __clang__
36+
#pragma clang diagnostic pop
37+
#elif defined(__GNUC__)
38+
#pragma GCC diagnostic pop
39+
#endif
40+
2541
#ifdef CANOPY_BUILD_COROUTINE
2642
#include <coro/io_scheduler.hpp>
2743
#endif

tests/test_host/remote_type_test_suite.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,23 @@
2020
#endif
2121

2222
// Other headers
23+
#ifdef __clang__
24+
#pragma clang diagnostic push
25+
#pragma clang diagnostic ignored "-Wsuggest-override"
26+
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
27+
#elif defined(__GNUC__)
28+
#pragma GCC diagnostic push
29+
#pragma GCC diagnostic ignored "-Wsuggest-override"
30+
#endif
31+
2332
#include <args.hxx>
33+
34+
#ifdef __clang__
35+
#pragma clang diagnostic pop
36+
#elif defined(__GNUC__)
37+
#pragma GCC diagnostic pop
38+
#endif
39+
2440
#ifdef CANOPY_BUILD_COROUTINE
2541
#include <coro/io_scheduler.hpp>
2642
#endif

tests/test_host/type_test_local_suite.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,23 @@
2020
#endif
2121

2222
// Other headers
23+
#ifdef __clang__
24+
#pragma clang diagnostic push
25+
#pragma clang diagnostic ignored "-Wsuggest-override"
26+
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
27+
#elif defined(__GNUC__)
28+
#pragma GCC diagnostic push
29+
#pragma GCC diagnostic ignored "-Wsuggest-override"
30+
#endif
31+
2332
#include <args.hxx>
33+
34+
#ifdef __clang__
35+
#pragma clang diagnostic pop
36+
#elif defined(__GNUC__)
37+
#pragma GCC diagnostic pop
38+
#endif
39+
2440
#ifdef CANOPY_BUILD_COROUTINE
2541
#include <coro/io_scheduler.hpp>
2642
#endif

0 commit comments

Comments
 (0)