Skip to content

Commit f547585

Browse files
snoe925snoe925
authored
Fix conflicts with boost placeholders (#18)
Remove using namespace in methods.h header. The user should get to select the namespace for _1, _2, ...
1 parent 45424b8 commit f547585

File tree

2 files changed

+36
-38
lines changed

2 files changed

+36
-38
lines changed

‎cpptcl/details/methods.h‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
// Note: this file is not supposed to be a stand-alone header
1212

13-
using namespace std::placeholders;
14-
1513
template <class C, typename R> class method0 : public object_cmd_base {
1614
typedef R (C::*mem_type)();
1715
typedef R (C::*cmem_type)() const;
@@ -49,9 +47,9 @@ template <class C, typename R, typename T1> class method1 : public object_cmd_ba
4947

5048
C *p = static_cast<C *>(pv);
5149
if (cmem_) {
52-
dispatch<R>::template do_dispatch<T1>(interp, std::bind(cf_, p, _1), tcl_cast<T1>::from(interp, objv[2], byRef.value));
50+
dispatch<R>::template do_dispatch<T1>(interp, std::bind(cf_, p, std::placeholders::_1), tcl_cast<T1>::from(interp, objv[2], byRef.value));
5351
} else {
54-
dispatch<R>::template do_dispatch<T1>(interp, std::bind(f_, p, _1), tcl_cast<T1>::from(interp, objv[2], byRef.value));
52+
dispatch<R>::template do_dispatch<T1>(interp, std::bind(f_, p, std::placeholders::_1), tcl_cast<T1>::from(interp, objv[2], byRef.value));
5553
}
5654
}
5755

@@ -76,9 +74,9 @@ template <class C, typename R, typename T1, typename T2> class method2 : public
7674

7775
C *p = static_cast<C *>(pv);
7876
if (cmem_) {
79-
dispatch<R>::template do_dispatch<T1, T2>(interp, std::bind(cf_, p, _1, _2), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value));
77+
dispatch<R>::template do_dispatch<T1, T2>(interp, std::bind(cf_, p, std::placeholders::_1, std::placeholders::_2), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value));
8078
} else {
81-
dispatch<R>::template do_dispatch<T1, T2>(interp, std::bind(f_, p, _1, _2), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value));
79+
dispatch<R>::template do_dispatch<T1, T2>(interp, std::bind(f_, p, std::placeholders::_1, std::placeholders::_2), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value));
8280
}
8381
}
8482

@@ -104,9 +102,9 @@ template <class C, typename R, typename T1, typename T2, typename T3> class meth
104102

105103
C *p = static_cast<C *>(pv);
106104
if (cmem_) {
107-
dispatch<R>::template do_dispatch<T1, T2, T3>(interp, std::bind(cf_, p, _1, _2, _3), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value));
105+
dispatch<R>::template do_dispatch<T1, T2, T3>(interp, std::bind(cf_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value));
108106
} else {
109-
dispatch<R>::template do_dispatch<T1, T2, T3>(interp, std::bind(f_, p, _1, _2, _3), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value));
107+
dispatch<R>::template do_dispatch<T1, T2, T3>(interp, std::bind(f_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value));
110108
}
111109
}
112110

@@ -133,9 +131,9 @@ template <class C, typename R, typename T1, typename T2, typename T3, typename T
133131

134132
C *p = static_cast<C *>(pv);
135133
if (cmem_) {
136-
dispatch<R>::template do_dispatch<T1, T2, T3, T4>(interp, std::bind(cf_, p, _1, _2, _3, _4), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value));
134+
dispatch<R>::template do_dispatch<T1, T2, T3, T4>(interp, std::bind(cf_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value));
137135
} else {
138-
dispatch<R>::template do_dispatch<T1, T2, T3, T4>(interp, std::bind(f_, p, _1, _2, _3, _4), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value));
136+
dispatch<R>::template do_dispatch<T1, T2, T3, T4>(interp, std::bind(f_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value));
139137
}
140138
}
141139

@@ -163,9 +161,9 @@ template <class C, typename R, typename T1, typename T2, typename T3, typename T
163161

164162
C *p = static_cast<C *>(pv);
165163
if (cmem_) {
166-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5>(interp, std::bind(cf_, p, _1, _2, _3, _4, _5), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value));
164+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5>(interp, std::bind(cf_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value));
167165
} else {
168-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5>(interp, std::bind(f_, p, _1, _2, _3, _4, _5), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value));
166+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5>(interp, std::bind(f_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value));
169167
}
170168
}
171169

@@ -194,9 +192,9 @@ template <class C, typename R, typename T1, typename T2, typename T3, typename T
194192

195193
C *p = static_cast<C *>(pv);
196194
if (cmem_) {
197-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6>(interp, std::bind(cf_, p, _1, _2, _3, _4, _5, _6), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value));
195+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6>(interp, std::bind(cf_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value));
198196
} else {
199-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6>(interp, std::bind(f_, p, _1, _2, _3, _4, _5, _6), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value));
197+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6>(interp, std::bind(f_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value));
200198
}
201199
}
202200

@@ -226,9 +224,9 @@ template <class C, typename R, typename T1, typename T2, typename T3, typename T
226224

227225
C *p = static_cast<C *>(pv);
228226
if (cmem_) {
229-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7>(interp, std::bind(cf_, p, _1, _2, _3, _4, _5, _6, _7), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value));
227+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7>(interp, std::bind(cf_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6, std::placeholders::_7), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value));
230228
} else {
231-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7>(interp, std::bind(f_, p, _1, _2, _3, _4, _5, _6, _7), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value));
229+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7>(interp, std::bind(f_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6, std::placeholders::_7), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value));
232230
}
233231
}
234232

@@ -259,9 +257,9 @@ template <class C, typename R, typename T1, typename T2, typename T3, typename T
259257

260258
C *p = static_cast<C *>(pv);
261259
if (cmem_) {
262-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7, T8>(interp, std::bind(cf_, p, _1, _2, _3, _4, _5, _6, _7, _8), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value), tcl_cast<T8>::from(interp, objv[9], byRef8.value));
260+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7, T8>(interp, std::bind(cf_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6, std::placeholders::_7, std::placeholders::_8), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value), tcl_cast<T8>::from(interp, objv[9], byRef8.value));
263261
} else {
264-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7, T8>(interp, std::bind(f_, p, _1, _2, _3, _4, _5, _6, _7, _8), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value), tcl_cast<T8>::from(interp, objv[9], byRef8.value));
262+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7, T8>(interp, std::bind(f_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6, std::placeholders::_7, std::placeholders::_8), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value), tcl_cast<T8>::from(interp, objv[9], byRef8.value));
265263
}
266264
}
267265

@@ -293,9 +291,9 @@ template <class C, typename R, typename T1, typename T2, typename T3, typename T
293291

294292
C *p = static_cast<C *>(pv);
295293
if (cmem_) {
296-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7, T8, T9>(interp, std::bind(cf_, p, _1, _2, _3, _4, _5, _6, _7, _8, _9), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value), tcl_cast<T8>::from(interp, objv[9], byRef8.value), tcl_cast<T9>::from(interp, objv[10], byRef9.value));
294+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7, T8, T9>(interp, std::bind(cf_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6, std::placeholders::_7, std::placeholders::_8, std::placeholders::_9), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value), tcl_cast<T8>::from(interp, objv[9], byRef8.value), tcl_cast<T9>::from(interp, objv[10], byRef9.value));
297295
} else {
298-
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7, T8, T9>(interp, std::bind(f_, p, _1, _2, _3, _4, _5, _6, _7, _8, _9), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value), tcl_cast<T8>::from(interp, objv[9], byRef8.value), tcl_cast<T9>::from(interp, objv[10], byRef9.value));
296+
dispatch<R>::template do_dispatch<T1, T2, T3, T4, T5, T6, T7, T8, T9>(interp, std::bind(f_, p, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5, std::placeholders::_6, std::placeholders::_7, std::placeholders::_8, std::placeholders::_9), tcl_cast<T1>::from(interp, objv[2], byRef1.value), tcl_cast<T2>::from(interp, objv[3], byRef2.value), tcl_cast<T3>::from(interp, objv[4], byRef3.value), tcl_cast<T4>::from(interp, objv[5], byRef4.value), tcl_cast<T5>::from(interp, objv[6], byRef5.value), tcl_cast<T6>::from(interp, objv[7], byRef6.value), tcl_cast<T7>::from(interp, objv[8], byRef7.value), tcl_cast<T8>::from(interp, objv[9], byRef8.value), tcl_cast<T9>::from(interp, objv[10], byRef9.value));
299297
}
300298
}
301299

0 commit comments

Comments
 (0)