ardour/livetrax
13
0
Fork 0
Code

Disambiguate std and boost placeholder

Browse Source
This commit is contained in:
Alejandro Domínguez 2024-11-17 20:20:21 +01:00 committed by Robin Gareus
parent 27c6276ff8
commit fa57d5ed86
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/evoral/ControlSet.cc
View File

@ -26,6 +26,7 @@
#include "evoral/Event.h" #include "evoral/Event.h"
using namespace std; using namespace std;
using namespace std::placeholders;
namespace Evoral { namespace Evoral {

5
libs/pbd/receiver.cc
View File

@ -42,9 +42,8 @@ void
Receiver::listen_to (Transmitter &transmitter) Receiver::listen_to (Transmitter &transmitter)
{ {
/* odd syntax here because boost's placeholders (_1, _2) are in an /* odd syntax here because std's placeholders (_1, _2) are in an
anonymous namespace which causes ambiguity with sigc++ (and will also anonymous namespace which causes ambiguity with sigc++
do so with std::placeholder in the C++11 future
*/ */
transmitter.sender().connect_same_thread (connections, std::bind (&Receiver::receive, this, std::placeholders::_1, std::placeholders::_2)); transmitter.sender().connect_same_thread (connections, std::bind (&Receiver::receive, this, std::placeholders::_1, std::placeholders::_2));