X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fbind.h;h=e9b6a632771083f081d3cd9f5ab39c305748ecd8;hb=41a8994da902031a743373c1c57d028b7c900797;hp=f613bdb40851d32329d95ad87b5b87f249fb560b;hpb=807fc1443a3ac64c24d9bef5428f46f59437b459;p=lyx.git diff --git a/src/support/bind.h b/src/support/bind.h index f613bdb408..e9b6a63277 100644 --- a/src/support/bind.h +++ b/src/support/bind.h @@ -12,36 +12,15 @@ #ifndef LYX_BIND_H #define LYX_BIND_H -#include "checktr1.h" - - -#ifdef LYX_USE_TR1 - -#include - -#ifdef __GNUC__ -#include -#endif - -namespace lyx -{ - using std::tr1::bind; - using std::tr1::placeholders::_1; - using std::tr1::placeholders::_2; - using std::tr1::ref; -} - -#else - -#include "boost/bind.hpp" +#include "support/functional.h" namespace lyx { - using boost::bind; - using boost::ref; -} - -#endif + using std::placeholders::_1; + using std::placeholders::_2; + using std::bind; + using std::ref; +} // namespace #endif