From 339a37b03443a4e6721afb665a7384f542cc8b5d Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sat, 16 Mar 2019 15:15:59 -0700 Subject: Include std::placeholders once in an anonymouse namespace --- Alc/panning.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Alc/panning.cpp b/Alc/panning.cpp index 25b940a2..209c650c 100644 --- a/Alc/panning.cpp +++ b/Alc/panning.cpp @@ -53,6 +53,8 @@ constexpr std::array AmbiIndex::From3D; namespace { +using namespace std::placeholders; + inline const char *GetLabelFromChannel(Channel channel) { switch(channel) @@ -245,8 +247,6 @@ void InitNearFieldCtrl(ALCdevice *device, ALfloat ctrl_dist, ALsizei order, cons void InitDistanceComp(ALCdevice *device, const AmbDecConf *conf, const ALsizei (&speakermap)[MAX_OUTPUT_CHANNELS]) { - using namespace std::placeholders; - const ALfloat maxdist{ std::accumulate(conf->Speakers.begin(), conf->Speakers.end(), float{0.0f}, std::bind(maxf, _1, std::bind(std::mem_fn(&AmbDecConf::SpeakerConf::Distance), _2)) @@ -525,7 +525,6 @@ void InitHQPanning(ALCdevice *device, const AmbDecConf *conf, const ALsizei (&sp device->RealOut.NumChannels = device->channelsFromFmt(); - using namespace std::placeholders; auto accum_spkr_dist = std::bind( std::plus{}, _1, std::bind(std::mem_fn(&AmbDecConf::SpeakerConf::Distance), _2) ); -- cgit v1.2.3