Skip to content

Commit 4942ef1

Browse files
committed
Remove BOOST_VERSION macros
1 parent ac324ac commit 4942ef1

File tree

5 files changed

+1
-30
lines changed

5 files changed

+1
-30
lines changed

lib/ClientConnection.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,7 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
178178
executor_(executor),
179179
resolver_(executor_->createTcpResolver()),
180180
socket_(executor_->createSocket()),
181-
#if defined(USE_ASIO) || BOOST_VERSION >= 107000
182181
strand_(ASIO::make_strand(executor_->getIOService().get_executor())),
183-
#elif BOOST_VERSION >= 106600
184-
strand_(executor_->getIOService().get_executor()),
185-
#else
186-
strand_(executor_->getIOService()),
187-
#endif
188182
logicalAddress_(logicalAddress),
189183
physicalAddress_(physicalAddress),
190184
cnxString_("[<none> -> " + physicalAddress + "] "),

lib/JsonUtils.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,7 @@ template <typename Ptree>
2828
inline std::string toJson(const Ptree& pt) {
2929
std::ostringstream oss;
3030
boost::property_tree::write_json(oss, pt, false);
31-
// For Boost < 1.86, boost::property_tree will write a endline at the end
32-
#if BOOST_VERSION < 108600
33-
auto s = oss.str();
34-
s.pop_back();
35-
return s;
36-
#else
3731
return oss.str();
38-
#endif
3932
}
4033

4134
} // namespace pulsar

lib/Murmur3_32Hash.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@
2424
#include "Murmur3_32Hash.h"
2525

2626
#include <boost/version.hpp>
27-
#if BOOST_VERSION >= 105500
2827
#include <boost/predef.h>
29-
#else
30-
#include <boost/detail/endian.hpp>
31-
#endif
3228
#include <limits>
3329

3430
#if BOOST_COMP_MSVC

lib/checksum/crc32c_sse42.cc

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,8 @@
1515
******************************************************************************/
1616
#include "crc32c_sse42.h"
1717

18-
#include <boost/version.hpp>
19-
#if BOOST_VERSION >= 105500
20-
#include <boost/predef.h>
21-
#else
22-
#if _MSC_VER
23-
#pragma message("Boost version is < 1.55, disable CRC32C")
24-
#else
25-
#warning "Boost version is < 1.55, disable CRC32C"
26-
#endif
27-
#endif
28-
2918
#include <assert.h>
19+
#include <boost/predef.h>
3020
#include <stdlib.h>
3121

3222
#include "gf2.hpp"

lib/stats/ProducerStatsImpl.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222

2323
#include <map>
2424

25-
#if BOOST_VERSION >= 106400
2625
#include <boost/serialization/array_wrapper.hpp>
27-
#endif
2826
#include <boost/accumulators/accumulators.hpp>
2927
#include <boost/accumulators/framework/accumulator_set.hpp>
3028
#include <boost/accumulators/framework/features.hpp>

0 commit comments

Comments
 (0)