anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't pollute the global namespace, move bind and shared_ptr into the lyx scope.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34264 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-04-22 15:56:20 +00:00
parent 4654a8bf96
commit 5b916eb7c5
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/support/bind.h
View File

@ -15,16 +15,24 @@
#if defined(_MSC_VER) && (_MSC_VER >= 1600)
#include <functional>
using std::tr1::bind;
using std::tr1::placeholders::_1;
using std::tr1::placeholders::_2;
using std::tr1::ref;
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"
using boost::bind;
using boost::ref;
namespace lyx
{
using boost::bind;
using boost::ref;
}
#endif

12
src/support/shared_ptr.h
View File

@ -15,12 +15,20 @@
#if defined(_MSC_VER) && (_MSC_VER >= 1600)
#include <memory>
using std::tr1::shared_ptr;
namespace lyx
{
using std::tr1::shared_ptr;
}
#else
#include <boost/shared_ptr.hpp>
using boost::shared_ptr;
namespace lyx
{
using boost::shared_ptr;
}
#endif