use boost::bind instead of std::bind until boost placeholders are in separate namespace

This commit is contained in:
Andrzej Rybczak
2013-07-09 23:08:49 +02:00
parent 12c7dc2f5b
commit 0dcec65edf
11 changed files with 72 additions and 73 deletions

View File

@@ -18,8 +18,9 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <cassert>
#include <algorithm>
#include <boost/bind.hpp>
#include <cassert>
#include "charset.h"
#include "display.h"
@@ -36,8 +37,6 @@
#include "title.h"
#include "screen_switcher.h"
using namespace std::placeholders;
using Global::MainHeight;
using Global::MainStartY;
@@ -79,9 +78,9 @@ PlaylistEditor::PlaylistEditor()
Content.setSelectedPrefix(Config.selected_item_prefix);
Content.setSelectedSuffix(Config.selected_item_suffix);
if (Config.columns_in_playlist_editor)
Content.setItemDisplayer(std::bind(Display::SongsInColumns, _1, contentProxyList()));
Content.setItemDisplayer(boost::bind(Display::SongsInColumns, _1, contentProxyList()));
else
Content.setItemDisplayer(std::bind(Display::Songs, _1, contentProxyList(), Config.song_list_format));
Content.setItemDisplayer(boost::bind(Display::Songs, _1, contentProxyList(), Config.song_list_format));
w = &Playlists;
}