jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ajrheading1-remove-unary-binary-function'

Browse source 
* ajrheading1-remove-unary-binary-function:
  Remove inheritance from std::unary_function and std::binary_function, they are deprecated in C++11 and already removed in Visual C++ '15' running with /std:c++latest
This commit is contained in:
William S Fulton 2016-12-31 00:10:26 +00:00
commit 84c0cb2fe0
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/octave/octcontainer.swg
View file

@ -68,7 +68,7 @@ namespace swig {
namespace std { namespace std {
template <> template <>
struct less <octave_value>: public binary_function<octave_value, octave_value, bool> struct less <octave_value>
{ {
bool bool
operator()(const octave_value& v, const octave_value& w) const operator()(const octave_value& v, const octave_value& w) const

6
Lib/python/pycontainer.swg
View file

@ -108,7 +108,7 @@ namespace swig {
namespace std { namespace std {
template <> template <>
struct less <PyObject *>: public binary_function<PyObject *, PyObject *, bool> struct less <PyObject *>
{ {
bool bool
operator()(PyObject * v, PyObject *w) const operator()(PyObject * v, PyObject *w) const
@ -133,7 +133,7 @@ namespace std {
}; };
template <> template <>
struct less <swig::SwigPtr_PyObject>: public binary_function<swig::SwigPtr_PyObject, swig::SwigPtr_PyObject, bool> struct less <swig::SwigPtr_PyObject>
{ {
bool bool
operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const operator()(const swig::SwigPtr_PyObject& v, const swig::SwigPtr_PyObject& w) const
@ -143,7 +143,7 @@ namespace std {
}; };
template <> template <>
struct less <swig::SwigVar_PyObject>: public binary_function<swig::SwigVar_PyObject, swig::SwigVar_PyObject, bool> struct less <swig::SwigVar_PyObject>
{ {
bool bool
operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const operator()(const swig::SwigVar_PyObject& v, const swig::SwigVar_PyObject& w) const

2
Lib/ruby/rubycontainer.swg
View file

@ -38,7 +38,7 @@
namespace swig { namespace swig {
template < class T > template < class T >
struct yield : public std::unary_function< T, bool > struct yield
{ {
bool bool
operator()( const T& v ) const operator()( const T& v ) const

8
Lib/ruby/rubystdfunctors.swg
View file

@ -90,7 +90,7 @@ namespace swig {
static ID call_id = rb_intern("call"); static ID call_id = rb_intern("call");
template <class _T = GC_VALUE, class _DefaultFunc = std::less<GC_VALUE> > template <class _T = GC_VALUE, class _DefaultFunc = std::less<GC_VALUE> >
struct BinaryPredicate : GC_VALUE, std::binary_function< _T, _T, bool > struct BinaryPredicate : GC_VALUE
{ {
BinaryPredicate(VALUE obj = Qnil) : GC_VALUE(obj) { } BinaryPredicate(VALUE obj = Qnil) : GC_VALUE(obj) { }
bool operator()(_T a, _T b) const bool operator()(_T a, _T b) const
@ -109,7 +109,7 @@ namespace swig {
}; };
template <class _T = GC_VALUE, class _DefaultFunc = std::less< _T > > template <class _T = GC_VALUE, class _DefaultFunc = std::less< _T > >
struct BinaryFunction : GC_VALUE, std::binary_function< _T, _T, _T > struct BinaryFunction : GC_VALUE
{ {
BinaryFunction(VALUE obj = Qnil) : GC_VALUE(obj) { } BinaryFunction(VALUE obj = Qnil) : GC_VALUE(obj) { }
_T operator()(_T a, _T b) const _T operator()(_T a, _T b) const
@ -128,7 +128,7 @@ namespace swig {
}; };
template< class _T = GC_VALUE > template< class _T = GC_VALUE >
struct UnaryPredicate : GC_VALUE, std::unary_function< _T, bool > struct UnaryPredicate : GC_VALUE
{ {
UnaryPredicate(VALUE obj = Qnil) : GC_VALUE(obj) { } UnaryPredicate(VALUE obj = Qnil) : GC_VALUE(obj) { }
bool operator()(_T a) const bool operator()(_T a) const
@ -142,7 +142,7 @@ namespace swig {
}; };
template< class _T = GC_VALUE > template< class _T = GC_VALUE >
struct UnaryFunction : GC_VALUE, std::unary_function< _T, _T > struct UnaryFunction : GC_VALUE
{ {
UnaryFunction(VALUE obj = Qnil) : GC_VALUE(obj) { } UnaryFunction(VALUE obj = Qnil) : GC_VALUE(obj) { }
_T operator()(_T a) const _T operator()(_T a) const