X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fbind.h;h=5a734ff931ae31460bcb8f36caeb8bca2c5ee1ee;hb=8d640dc77608bedddb5b00982c23665584f52d21;hp=1931b163ec2f140a2ef7398031928a111811ebee;hpb=90b1f084bf0998e37ad3fa9f54641656044c448f;p=lyx.git diff --git a/src/support/bind.h b/src/support/bind.h index 1931b163ec..5a734ff931 100644 --- a/src/support/bind.h +++ b/src/support/bind.h @@ -14,40 +14,13 @@ #include "support/functional.h" -#ifdef LYX_USE_TR1 - -#define LYX_BIND_NS std::tr1 - -namespace lyx -{ - using std::tr1::placeholders::_1; - using std::tr1::placeholders::_2; -} - -#elif __cplusplus >= 201103L - -#define LYX_BIND_NS std - namespace lyx { using std::placeholders::_1; using std::placeholders::_2; + using std::bind; + using std::ref; } -#else - -#include -#define LYX_BIND_NS boost - -#endif - -namespace lyx -{ - using LYX_BIND_NS::bind; - using LYX_BIND_NS::ref; -} - -#undef LYX_BIND_NS - #endif