Skip to content

Commit 9a25f2a

Browse files
committed
MDEV-35632: HandlerSocket uses deprecated auto_ptr
Let us suppress the deprecation warnings more specifically. This fixes up commit d76f577
1 parent 965e65d commit 9a25f2a

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

plugin/handler_socket/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ IF(WIN32 OR WITHOUT_SERVER)
66
RETURN()
77
ENDIF()
88

9-
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-deprecated-declarations")
10-
119
INCLUDE_DIRECTORIES(libhsclient)
1210

1311
# Handlersocket client library. We do not distribute it,

plugin/handler_socket/handlersocket/database.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
#ifndef DENA_DATABASE_HPP
1010
#define DENA_DATABASE_HPP
1111

12+
#ifdef __GNUC__
13+
/* auto_ptr is deprecated */
14+
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
15+
#endif
16+
1217
#include <string>
1318
#include <memory>
1419
#include <vector>

plugin/handler_socket/libhsclient/hstcpcli.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
#include "string_ref.hpp"
2020
#include "string_buffer.hpp"
2121

22+
#ifdef __GNUC__
23+
/* auto_ptr is deprecated */
24+
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
25+
#endif
26+
2227
namespace dena {
2328

2429
struct hstcpcli_filter {

0 commit comments

Comments
 (0)