Skip to content

Commit ceef58d

Browse files
committed
[#215] Ignore build warnings in Boost include
And re-enable build warnings in the build script for the builder Dockerfile.
1 parent 1224d43 commit ceef58d

File tree

7 files changed

+22
-11
lines changed

7 files changed

+22
-11
lines changed

.github/workflows/build-and-test-s3-api-ubuntu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ jobs:
8080
mkdir build
8181
cd build
8282
cmake \
83-
-DIRODS_BUILD_WITH_WERROR=NO \
8483
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
8584
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
8685
-GNinja \

build_packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ set -x
44

55
mkdir -p /_build_s3_api
66
cd /_build_s3_api
7-
cmake -DIRODS_BUILD_WITH_WERROR=NO -GNinja /s3_api_source
7+
cmake -GNinja /s3_api_source
88
ninja package
99
cp ./*.deb /packages_output

core/include/irods/private/s3_api/authentication.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#ifndef IRODS_S3_API_AUTHENTICATION_HPP
22
#define IRODS_S3_API_AUTHENTICATION_HPP
33

4+
#pragma GCC diagnostic push
5+
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
46
#include <boost/beast.hpp>
7+
#pragma GCC diagnostic pop
8+
59
#include <boost/url.hpp>
610

711
#include <optional>

core/include/irods/private/s3_api/common.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
#include <irods/rodsErrorTable.h>
1010

1111
#include <boost/beast/http/status.hpp>
12+
13+
#pragma GCC diagnostic push
14+
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
1215
#include <boost/beast/http/string_body.hpp>
16+
#pragma GCC diagnostic pop
1317

1418
#include <fmt/format.h>
1519

core/include/irods/private/s3_api/common_routines.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include <string>
55

66
#include <fmt/format.h>
7-
#pragma clang diagnostic push
8-
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
7+
#pragma GCC diagnostic push
8+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
99
#include <fmt/chrono.h>
10-
#pragma clang diagnostic pop
10+
#pragma GCC diagnostic pop
1111

1212
#include <boost/uuid/uuid.hpp>
1313
#include <boost/uuid/uuid_generators.hpp>

core/include/irods/private/s3_api/transport.hpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@
55
#include <boost/asio/ip/tcp.hpp>
66
#include <boost/asio/ssl.hpp>
77
#include <boost/beast/core/tcp_stream.hpp>
8-
#include <boost/beast/http/string_body.hpp>
9-
#include <boost/beast/http/read.hpp>
10-
#include <boost/beast/http/write.hpp>
118
#include <boost/beast/ssl.hpp>
129
#include <boost/url/parse.hpp>
1310

11+
#pragma GCC diagnostic push
12+
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
13+
#include <boost/beast/http/read.hpp>
14+
#include <boost/beast/http/string_body.hpp>
15+
#include <boost/beast/http/write.hpp>
16+
#pragma GCC diagnostic pop
17+
1418
#include <string_view>
1519
#include <memory>
1620

core/src/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
#include <boost/program_options.hpp>
3232
#include <boost/url/parse.hpp>
3333

34-
#pragma clang diagnostic push
35-
#pragma clang diagnostic ignored "-Wunused-parameter"
34+
#pragma GCC diagnostic push
35+
#pragma GCC diagnostic ignored "-Wunused-parameter"
3636
#include <boost/process.hpp>
37-
#pragma clang diagnostic pop
37+
#pragma GCC diagnostic pop
3838

3939
#include <fmt/format.h>
4040
#include <nlohmann/json.hpp>

0 commit comments

Comments
 (0)