Skip to content

Commit 705fb56

Browse files
igaztanagaigaztanaga
committed
Make conversion-aware helpers forceinline
1 parent ae8cf40 commit 705fb56

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

‎include/boost/move/detail/move_helpers.hpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,26 @@
6969
{};
7070

7171
#define BOOST_MOVE_CONVERSION_AWARE_CATCH_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
72-
inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
72+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
7373
{ return FWD_FUNCTION(static_cast<const TYPE&>(x)); }\
7474
\
75-
inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
75+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
7676
{ return FWD_FUNCTION(::boost::move(x)); }\
7777
\
78-
inline RETURN_VALUE PUB_FUNCTION(TYPE &x)\
78+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(TYPE &x)\
7979
{ return FWD_FUNCTION(const_cast<const TYPE &>(x)); }\
8080
//
8181
#if defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN)
8282
#define BOOST_MOVE_CONVERSION_AWARE_CATCH(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
8383
BOOST_MOVE_CONVERSION_AWARE_CATCH_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
8484
\
8585
template<class BOOST_MOVE_TEMPL_PARAM>\
86-
inline RETURN_VALUE PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u,\
86+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u,\
8787
typename boost_move_conversion_aware_catch_1< ::boost::move_detail::nat, BOOST_MOVE_TEMPL_PARAM, TYPE>::type* = 0)\
8888
{ return FWD_FUNCTION(u); }\
8989
\
9090
template<class BOOST_MOVE_TEMPL_PARAM>\
91-
inline RETURN_VALUE PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u,\
91+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u,\
9292
typename boost_move_conversion_aware_catch_2< ::boost::move_detail::nat, BOOST_MOVE_TEMPL_PARAM, TYPE>::type* = 0)\
9393
{\
9494
TYPE t((u));\
@@ -100,12 +100,12 @@
100100
BOOST_MOVE_CONVERSION_AWARE_CATCH_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
101101
\
102102
template<class BOOST_MOVE_TEMPL_PARAM>\
103-
inline typename boost_move_conversion_aware_catch_1<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, TYPE>::type\
103+
BOOST_MOVE_FORCEINLINE typename boost_move_conversion_aware_catch_1<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, TYPE>::type\
104104
PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u)\
105105
{ return FWD_FUNCTION(u); }\
106106
\
107107
template<class BOOST_MOVE_TEMPL_PARAM>\
108-
inline typename boost_move_conversion_aware_catch_2<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, TYPE>::type\
108+
BOOST_MOVE_FORCEINLINE typename boost_move_conversion_aware_catch_2<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, TYPE>::type\
109109
PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u)\
110110
{\
111111
TYPE t((u));\
@@ -116,14 +116,14 @@
116116
#elif (defined(_MSC_VER) && (_MSC_VER == 1600))
117117

118118
#define BOOST_MOVE_CONVERSION_AWARE_CATCH(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
119-
inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
119+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
120120
{ return FWD_FUNCTION(static_cast<const TYPE&>(x)); }\
121121
\
122-
inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
122+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
123123
{ return FWD_FUNCTION(::boost::move(x)); }\
124124
\
125125
template<class BOOST_MOVE_TEMPL_PARAM>\
126-
inline typename ::boost::move_detail::enable_if_c\
126+
BOOST_MOVE_FORCEINLINE typename ::boost::move_detail::enable_if_c\
127127
< !::boost::move_detail::is_same<TYPE, BOOST_MOVE_TEMPL_PARAM>::value\
128128
, RETURN_VALUE >::type\
129129
PUB_FUNCTION(const BOOST_MOVE_TEMPL_PARAM &u)\
@@ -136,10 +136,10 @@
136136
#else //BOOST_NO_CXX11_RVALUE_REFERENCES
137137

138138
#define BOOST_MOVE_CONVERSION_AWARE_CATCH(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION)\
139-
inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
139+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_CONST(TYPE) x)\
140140
{ return FWD_FUNCTION(x); }\
141141
\
142-
inline RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
142+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
143143
{ return FWD_FUNCTION(::boost::move(x)); }\
144144
//
145145

@@ -174,26 +174,26 @@
174174
{};
175175

176176
#define BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
177-
inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
177+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
178178
{ return FWD_FUNCTION(arg1, static_cast<const TYPE&>(x)); }\
179179
\
180-
inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
180+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
181181
{ return FWD_FUNCTION(arg1, ::boost::move(x)); }\
182182
\
183-
inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, TYPE &x)\
183+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, TYPE &x)\
184184
{ return FWD_FUNCTION(arg1, const_cast<const TYPE &>(x)); }\
185185
//
186186
#if defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN)
187187
#define BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
188188
BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
189189
\
190190
template<class BOOST_MOVE_TEMPL_PARAM>\
191-
inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u,\
191+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u,\
192192
typename boost_move_conversion_aware_catch_1arg_1<void, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type* = 0)\
193193
{ return FWD_FUNCTION(arg1, u); }\
194194
\
195195
template<class BOOST_MOVE_TEMPL_PARAM>\
196-
inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u,\
196+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u,\
197197
typename boost_move_conversion_aware_catch_1arg_2<void, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type* = 0)\
198198
{\
199199
TYPE t((u));\
@@ -205,12 +205,12 @@
205205
BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG_COMMON(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
206206
\
207207
template<class BOOST_MOVE_TEMPL_PARAM>\
208-
inline typename boost_move_conversion_aware_catch_1arg_1<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type\
208+
BOOST_MOVE_FORCEINLINE typename boost_move_conversion_aware_catch_1arg_1<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type\
209209
PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u)\
210210
{ return FWD_FUNCTION(arg1, u); }\
211211
\
212212
template<class BOOST_MOVE_TEMPL_PARAM>\
213-
inline typename boost_move_conversion_aware_catch_1arg_2<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type\
213+
BOOST_MOVE_FORCEINLINE typename boost_move_conversion_aware_catch_1arg_2<RETURN_VALUE, BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO, TYPE>::type\
214214
PUB_FUNCTION(ARG1 arg1, const BOOST_MOVE_TEMPL_PARAM &u)\
215215
{\
216216
TYPE t((u));\
@@ -222,14 +222,14 @@
222222
#elif (defined(_MSC_VER) && (_MSC_VER == 1600))
223223

224224
#define BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
225-
inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
225+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
226226
{ return FWD_FUNCTION(arg1, static_cast<const TYPE&>(x)); }\
227227
\
228-
inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
228+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
229229
{ return FWD_FUNCTION(arg1, ::boost::move(x)); }\
230230
\
231231
template<class BOOST_MOVE_TEMPL_PARAM>\
232-
inline typename ::boost::move_detail::disable_if_or\
232+
BOOST_MOVE_FORCEINLINE typename ::boost::move_detail::disable_if_or\
233233
< RETURN_VALUE \
234234
, ::boost::move_detail::is_same<TYPE, BOOST_MOVE_TEMPL_PARAM> \
235235
, ::boost::move_detail::is_same_or_convertible<BOOST_MOVE_TEMPL_PARAM, UNLESS_CONVERTIBLE_TO> \
@@ -244,10 +244,10 @@
244244
#else
245245

246246
#define BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(PUB_FUNCTION, TYPE, RETURN_VALUE, FWD_FUNCTION, ARG1, UNLESS_CONVERTIBLE_TO)\
247-
inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
247+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_CONST(TYPE) x)\
248248
{ return FWD_FUNCTION(arg1, static_cast<const TYPE&>(x)); }\
249249
\
250-
inline RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
250+
BOOST_MOVE_FORCEINLINE RETURN_VALUE PUB_FUNCTION(ARG1 arg1, BOOST_MOVE_CATCH_RVALUE(TYPE) x) \
251251
{ return FWD_FUNCTION(arg1, ::boost::move(x)); }\
252252
//
253253

0 commit comments

Comments
 (0)