Skip to content

Commit b75d84b

Browse files
author
Your Name
committed
chore: fix MinGW builds
1 parent 98cf872 commit b75d84b

7 files changed

Lines changed: 26 additions & 22 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ jobs:
134134
runs-on: "windows-2022"
135135
b2-toolset: "gcc"
136136
generator: "MinGW Makefiles"
137-
is-latest: false
137+
is-latest: true
138138
is-earliest: true
139-
name: "MinGW"
139+
name: "MinGW (shared)"
140140
shared: true
141-
build-type: "Release"
141+
build-type: "Debug"
142142
build-cmake: true
143143

144144
- compiler: "mingw"
@@ -148,9 +148,9 @@ jobs:
148148
runs-on: "windows-2022"
149149
b2-toolset: "gcc"
150150
generator: "MinGW Makefiles"
151-
is-latest: false
151+
is-latest: true
152152
is-earliest: true
153-
name: "MinGW"
153+
name: "MinGW (static)"
154154
shared: false
155155
build-type: "Release"
156156
build-cmake: true
@@ -340,7 +340,7 @@ jobs:
340340
b2-toolset: "gcc"
341341
is-latest: true
342342
name: "GCC 15: C++17-20 (ubsan)"
343-
shared: true
343+
shared: false
344344
ubsan: true
345345
build-type: "RelWithDebInfo"
346346

@@ -614,7 +614,7 @@ jobs:
614614
b2-toolset: "clang"
615615
is-latest: true
616616
name: "Clang 20: C++23-2C (ubsan, x86)"
617-
shared: true
617+
shared: false
618618
ubsan: true
619619
x86: true
620620
build-type: "RelWithDebInfo"

include/boost/http_proto/server/basic_router.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ class any_router
142142
friend class http_proto::basic_router;
143143
using opt_flags = unsigned int;
144144

145-
struct BOOST_SYMBOL_VISIBLE any_handler
145+
struct BOOST_HTTP_PROTO_DECL any_handler
146146
{
147-
BOOST_HTTP_PROTO_DECL virtual ~any_handler();
147+
virtual ~any_handler() = default;
148148
virtual std::size_t count() const noexcept = 0;
149149
virtual route_result invoke(
150150
basic_request&, basic_response&) const = 0;

include/boost/http_proto/server/route_handler.hpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ struct Request : basic_request
6363

6464
/** Response object for HTTP route handlers
6565
*/
66-
struct BOOST_SYMBOL_VISIBLE
67-
Response : basic_response
66+
struct Response : basic_response
6867
{
6968
/** The HTTP response message
7069
*/
@@ -87,16 +86,23 @@ struct BOOST_SYMBOL_VISIBLE
8786
*/
8887
capy::datastore data;
8988

89+
/** Constructor.
90+
*/
91+
BOOST_HTTP_PROTO_DECL
92+
Response();
93+
9094
/** Destructor.
9195
*/
92-
BOOST_HTTP_PROTO_DECL virtual ~Response();
96+
BOOST_HTTP_PROTO_DECL
97+
virtual ~Response();
9398

9499
/** Reset the object for a new request.
95100
This clears any state associated with
96101
the previous request, preparing the object
97102
for use with a new request.
98103
*/
99-
BOOST_HTTP_PROTO_DECL void reset();
104+
BOOST_HTTP_PROTO_DECL
105+
void reset();
100106

101107
/** Set the status code of the response.
102108
@par Example

include/boost/http_proto/sink.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace http_proto {
3636
@ref source,
3737
@ref parser.
3838
*/
39-
struct BOOST_SYMBOL_VISIBLE
39+
struct BOOST_HTTP_PROTO_DECL
4040
sink
4141
{
4242
/** The results of consuming data.
@@ -188,7 +188,6 @@ struct BOOST_SYMBOL_VISIBLE
188188
@param more `true` if there will be one
189189
or more subsequent calls.
190190
*/
191-
BOOST_HTTP_PROTO_DECL
192191
virtual
193192
results
194193
on_write(

include/boost/http_proto/source.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace http_proto {
3636
@ref sink,
3737
@ref serializer.
3838
*/
39-
struct BOOST_SYMBOL_VISIBLE
39+
struct BOOST_HTTP_PROTO_DECL
4040
source
4141
{
4242
/** The results of producing data.
@@ -191,7 +191,6 @@ struct BOOST_SYMBOL_VISIBLE
191191
indicate failure or that no more
192192
data remains (or both).
193193
*/
194-
BOOST_HTTP_PROTO_DECL
195194
virtual
196195
results
197196
on_read(

src/server/basic_router.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,6 @@ pattern target path(use) path(get)
8080

8181
//------------------------------------------------
8282

83-
84-
any_router::any_handler::~any_handler() = default;
85-
86-
//------------------------------------------------
87-
8883
/*
8984
static
9085
void

src/server/route_handler.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
namespace boost {
1616
namespace http_proto {
1717

18+
Response::
19+
Response()
20+
{
21+
}
22+
1823
Response::
1924
~Response()
2025
{

0 commit comments

Comments
 (0)