From 6d2d0c8ee59eed641937b19cf19a1ff08762cbfa Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 2 Jun 2023 17:27:57 -0400
Subject: SL-18837: Boost.Bind _1, _2 placeholders are no longer global.

This was a longstanding complaint: that Boost shouldn't dump the (somewhat
mysterious) _1, _2 et al. names into the global namespace. Recent Boost has
fixed that, requiring 'using namespace boost::placeholders;' if you want to
use them unqualified.
---
 indra/llinventory/llsettingsbase.cpp  | 4 ++++
 indra/llinventory/llsettingssky.cpp   | 4 ++++
 indra/llinventory/llsettingswater.cpp | 4 ++++
 3 files changed, 12 insertions(+)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index 936b166409..ba338dbbee 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -31,6 +31,10 @@
 #include <algorithm>
 
 #include "llsdserialize.h"
+#include <boost/bind.hpp>
+
+// allow unqualified _1, _2 et al. to mean boost::bind placeholders
+using namespace boost::placeholders;
 
 //=========================================================================
 namespace
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index a129f0a6f0..0244b2585e 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -31,6 +31,10 @@
 #include "lltrace.h"
 #include "llfasttimer.h"
 #include "v3colorutil.h"
+#include <boost/bind.hpp>
+
+// allow unqualified _1, _2 et al. to mean boost::bind placeholders
+using namespace boost::placeholders;
 
 //=========================================================================
 namespace
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index d732032a6c..bc53a46255 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -32,6 +32,10 @@
 #include "llfasttimer.h"
 #include "v3colorutil.h"
 #include "indra_constants.h"
+#include <boost/bind.hpp>
+
+// allow unqualified _1, _2 et al. to mean boost::bind placeholders
+using namespace boost::placeholders;
 
 const std::string LLSettingsWater::SETTING_BLUR_MULTIPLIER("blur_multiplier");
 const std::string LLSettingsWater::SETTING_FOG_COLOR("water_fog_color");
-- 
cgit v1.2.3


From ddc6d219585251ea6246f56bfa5aba6b3e2fd4f0 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 5 Jun 2023 21:47:52 -0400
Subject: SL-18837: Followup to 19e9e8c: global Boost.Bind placeholders

do not need 'using' directive, given BOOST_BIND_GLOBAL_PLACEHOLDERS.
---
 indra/llinventory/llsettingsbase.cpp  | 3 ---
 indra/llinventory/llsettingssky.cpp   | 3 ---
 indra/llinventory/llsettingswater.cpp | 3 ---
 3 files changed, 9 deletions(-)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llsettingsbase.cpp b/indra/llinventory/llsettingsbase.cpp
index ba338dbbee..6ea93e045d 100644
--- a/indra/llinventory/llsettingsbase.cpp
+++ b/indra/llinventory/llsettingsbase.cpp
@@ -33,9 +33,6 @@
 #include "llsdserialize.h"
 #include <boost/bind.hpp>
 
-// allow unqualified _1, _2 et al. to mean boost::bind placeholders
-using namespace boost::placeholders;
-
 //=========================================================================
 namespace
 {
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 0244b2585e..51fca76518 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -33,9 +33,6 @@
 #include "v3colorutil.h"
 #include <boost/bind.hpp>
 
-// allow unqualified _1, _2 et al. to mean boost::bind placeholders
-using namespace boost::placeholders;
-
 //=========================================================================
 namespace
 {
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index bc53a46255..89156000b0 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -34,9 +34,6 @@
 #include "indra_constants.h"
 #include <boost/bind.hpp>
 
-// allow unqualified _1, _2 et al. to mean boost::bind placeholders
-using namespace boost::placeholders;
-
 const std::string LLSettingsWater::SETTING_BLUR_MULTIPLIER("blur_multiplier");
 const std::string LLSettingsWater::SETTING_FOG_COLOR("water_fog_color");
 const std::string LLSettingsWater::SETTING_FOG_DENSITY("water_fog_density");
-- 
cgit v1.2.3