X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fbind.h;h=5a734ff931ae31460bcb8f36caeb8bca2c5ee1ee;hb=8d640dc77608bedddb5b00982c23665584f52d21;hp=2c636dce6de1d7486fad17c9ac8f1b4e1a114734;hpb=61b2bd5e7fd9399128342d9048aa814ae5f086fc;p=lyx.git diff --git a/src/support/bind.h b/src/support/bind.h index 2c636dce6d..5a734ff931 100644 --- a/src/support/bind.h +++ b/src/support/bind.h @@ -12,23 +12,15 @@ #ifndef LYX_BIND_H #define LYX_BIND_H -#if defined(_MSC_VER) && (_MSC_VER >= 1600) - -#include -using std::tr1::bind; -using std::tr1::placeholders::_1; -using std::tr1::placeholders::_2; -using std::tr1::ref; - -#else - -#include "support/bind.h" -using boost::bind; -using boost::_1; -using boost::_2; -using boost::ref; - -#endif +#include "support/functional.h" + +namespace lyx +{ + using std::placeholders::_1; + using std::placeholders::_2; + using std::bind; + using std::ref; +} #endif