summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-10-25 11:26:39 -0400
committerNat Goodspeed <nat@lindenlab.com>2020-03-25 16:12:46 -0400
commite9c667af96278d277eb2a20a6d8364d21464c3eb (patch)
treeedb96238eb227ed3c46d4e638fab6e887ab18276
parentf71c71fe42756e18e41c7e6ee531f1acc72815ca (diff)
DRTVWR-476: Eliminate std::mem_fun1() special case for Windows.
We used to have to use #if LL_WINDOWS logic to pass std::mem_fun1() to llbind2nd() instead of std::mem_fun() elsewhere. VS 2017 no longer supports std::mem_fun1(), which means we can eliminate the special case for Windows.
-rw-r--r--indra/newview/llfloaterregioninfo.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index ec934a4732..8a4f5dfc49 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -573,11 +573,7 @@ void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)
mInfoPanels.begin(),
mInfoPanels.end(),
llbind2nd(
-#if LL_WINDOWS
- std::mem_fun1(&LLPanelRegionInfo::refreshFromRegion),
-#else
std::mem_fun(&LLPanelRegionInfo::refreshFromRegion),
-#endif
region));
}