Skip to content

Commit ec9875a

Browse files
committed
inline static?
1 parent d24d1fe commit ec9875a

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

doc/modules/ROOT/examples/custom_rtti.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// See accompanying file LICENSE_1_0.txt
44
// or copy at http://www.boost.org/LICENSE_1_0.txt)
55

6-
#ifdef _MSC_VER
6+
#ifdef BOOST_COMP_MSVC
77
#pragma warning(disable : 4312)
88
#endif
99

doc/modules/ROOT/examples/deferred_custom_rtti.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// See accompanying file LICENSE_1_0.txt
44
// or copy at http://www.boost.org/LICENSE_1_0.txt)
55

6-
#ifdef _MSC_VER
6+
#ifdef BOOST_COMP_MSVC
77
#pragma warning(disable : 4312)
88
#endif
99

include/boost/openmethod/core.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
#define BOOST_OPENMETHOD_DEFAULT_REGISTRY ::boost::openmethod::default_registry
2828
#endif
2929

30-
#ifdef _MSC_VER
30+
#ifdef BOOST_COMP_MSVC
3131
#pragma warning(push)
3232
#pragma warning(disable : 4646)
33+
#pragma warning(disable : 4100)
3334
#endif
3435

3536
namespace boost::openmethod {
@@ -1751,7 +1752,7 @@ using boost::openmethod::virtual_ptr;
17511752

17521753
} // namespace boost::openmethod
17531754

1754-
#ifdef _MSC_VER
1755+
#ifdef BOOST_COMP_MSVC
17551756
#pragma warning(pop)
17561757
#endif
17571758

include/boost/openmethod/initialize.hpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
#include <boost/assert.hpp>
2626
#include <boost/dynamic_bitset.hpp>
2727

28+
#ifdef BOOST_COMP_MSVC
29+
#pragma warning(push)
30+
#pragma warning(disable : 4457)
31+
#endif
32+
2833
namespace boost::openmethod {
2934
namespace detail {
3035

@@ -811,7 +816,7 @@ void registry<Policies...>::compiler::build_dispatch_tables() {
811816
mask.resize(m.specs.size());
812817

813818
std::size_t group_index = 0;
814-
indent _(trace);
819+
indent _2(trace);
815820

816821
for (auto& spec : m.specs) {
817822
if (spec.vp[dim]->transitive_derived.find(
@@ -1161,7 +1166,7 @@ void registry<Policies...>::compiler::write_global_data() {
11611166
} else {
11621167
trace << "vp #" << entry.vp_index << " group #"
11631168
<< entry.group_index << "\n";
1164-
indent _(trace);
1169+
indent _2(trace);
11651170
++trace << type_name(method.info->method_type_id);
11661171
BOOST_ASSERT(gv_iter + 1 <= gv_last);
11671172

@@ -1350,4 +1355,8 @@ auto finalize() -> void {
13501355

13511356
} // namespace boost::openmethod
13521357

1358+
#ifdef BOOST_COMP_MSVC
1359+
#pragma warning(pop)
1360+
#endif
1361+
13531362
#endif

include/boost/openmethod/registry.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ struct trace final {
411411
template<class Registry>
412412
struct fn {
413413
inline static bool on = []() {
414-
#ifdef _MSC_VER
414+
#ifdef BOOST_COMP_MSVC
415415
char* env;
416416
std::size_t len;
417417
auto result =

0 commit comments

Comments
 (0)