diff --git a/indra/llcommon/lleventdispatcher.cpp b/indra/llcommon/lleventdispatcher.cpp
index 5b6d4efbe98b8259d09197444b7cc914d80bf554..12917e42855a70e2bc0b8943b87a593603397bbe 100755
--- a/indra/llcommon/lleventdispatcher.cpp
+++ b/indra/llcommon/lleventdispatcher.cpp
@@ -42,7 +42,7 @@
#include "llerror.h"
#include "llsdutil.h"
#include "stringize.h"
-#include <memory> // std::auto_ptr
+#include <memory>
/*****************************************************************************
* LLSDArgsSource
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h
index 7b9b1285f59c1a3bda4c85de7c25585c84c67547..5e4effcbd84059ae37f766cff42f3e0a86e89726 100755
--- a/indra/llcommon/llsd.h
+++ b/indra/llcommon/llsd.h
@@ -412,49 +412,6 @@ public:
static std::string typeString(Type type); // Return human-readable type as a string
};
-struct llsd_select_bool : public std::unary_function<LLSD, LLSD::Boolean>
-{
- LLSD::Boolean operator()(const LLSD& sd) const
- {
- return sd.asBoolean();
- }
-};
-struct llsd_select_integer : public std::unary_function<LLSD, LLSD::Integer>
-{
- LLSD::Integer operator()(const LLSD& sd) const
- {
- return sd.asInteger();
- }
-};
-struct llsd_select_real : public std::unary_function<LLSD, LLSD::Real>
-{
- LLSD::Real operator()(const LLSD& sd) const
- {
- return sd.asReal();
- }
-};
-struct llsd_select_float : public std::unary_function<LLSD, F32>
-{
- F32 operator()(const LLSD& sd) const
- {
- return (F32)sd.asReal();
- }
-};
-struct llsd_select_uuid : public std::unary_function<LLSD, LLSD::UUID>
-{
- LLSD::UUID operator()(const LLSD& sd) const
- {
- return sd.asUUID();
- }
-};
-struct llsd_select_string : public std::unary_function<LLSD, LLSD::String>
-{
- LLSD::String operator()(const LLSD& sd) const
- {
- return sd.asString();
- }
-};
-
LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLSD& llsd);
namespace llsd
diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h
index 8dedd69742abd2a5e41c7fa63d6eb0533aa9aa68..13ce63ba5af34d4b3a33f8f44bc9e41d9e72e563 100755
--- a/indra/llcommon/llstl.h
+++ b/indra/llcommon/llstl.h
@@ -119,46 +119,6 @@ struct DeletePairedPointerArray
}
};
-
-// Alternate version of the above so that has a more cumbersome
-// syntax, but it can be used with compositional functors.
-// NOTE: The functor retuns a bool because msdev bombs during the
-// composition if you return void. Once we upgrade to a newer
-// compiler, the second unary_function template parameter can be set
-// to void.
-//
-// Here's a snippet showing how you use this object:
-//
-// typedef std::map<int, widget*> map_type;
-// map_type widget_map;
-// ... // add elements
-// // delete them all
-// for_each(widget_map.begin(),
-// widget_map.end(),
-// llcompose1(DeletePointerFunctor<widget>(),
-// llselect2nd<map_type::value_type>()));
-
-template<typename T>
-struct DeletePointerFunctor : public std::unary_function<T*, bool>
-{
- bool operator()(T* ptr) const
- {
- delete ptr;
- return true;
- }
-};
-
-// See notes about DeleteArray for why you should consider avoiding this.
-template<typename T>
-struct DeleteArrayFunctor : public std::unary_function<T*, bool>
-{
- bool operator()(T* ptr) const
- {
- delete[] ptr;
- return true;
- }
-};
-
// CopyNewPointer is a simple helper which accepts a pointer, and
// returns a new pointer built with the copy constructor. Example:
//
@@ -385,132 +345,6 @@ OutputIter ll_transform_n(
*/
-// helper to deal with the fact that MSDev does not package
-// select... with the stl. Look up usage on the sgi website.
-
-template <class _Pair>
-struct _LLSelect1st : public std::unary_function<_Pair, typename _Pair::first_type> {
- const typename _Pair::first_type& operator()(const _Pair& __x) const {
- return __x.first;
- }
-};
-
-template <class _Pair>
-struct _LLSelect2nd : public std::unary_function<_Pair, typename _Pair::second_type>
-{
- const typename _Pair::second_type& operator()(const _Pair& __x) const {
- return __x.second;
- }
-};
-
-template <class _Pair> struct llselect1st : public _LLSelect1st<_Pair> {};
-template <class _Pair> struct llselect2nd : public _LLSelect2nd<_Pair> {};
-
-// helper to deal with the fact that MSDev does not package
-// compose... with the stl. Look up usage on the sgi website.
-
-template <class _Operation1, class _Operation2>
-class ll_unary_compose :
- public std::unary_function<typename _Operation2::argument_type,
- typename _Operation1::result_type>
-{
-protected:
- _Operation1 __op1;
- _Operation2 __op2;
-public:
- ll_unary_compose(const _Operation1& __x, const _Operation2& __y)
- : __op1(__x), __op2(__y) {}
- typename _Operation1::result_type
- operator()(const typename _Operation2::argument_type& __x) const {
- return __op1(__op2(__x));
- }
-};
-
-template <class _Operation1, class _Operation2>
-inline ll_unary_compose<_Operation1,_Operation2>
-llcompose1(const _Operation1& __op1, const _Operation2& __op2)
-{
- return ll_unary_compose<_Operation1,_Operation2>(__op1, __op2);
-}
-
-template <class _Operation1, class _Operation2, class _Operation3>
-class ll_binary_compose
- : public std::unary_function<typename _Operation2::argument_type,
- typename _Operation1::result_type> {
-protected:
- _Operation1 _M_op1;
- _Operation2 _M_op2;
- _Operation3 _M_op3;
-public:
- ll_binary_compose(const _Operation1& __x, const _Operation2& __y,
- const _Operation3& __z)
- : _M_op1(__x), _M_op2(__y), _M_op3(__z) { }
- typename _Operation1::result_type
- operator()(const typename _Operation2::argument_type& __x) const {
- return _M_op1(_M_op2(__x), _M_op3(__x));
- }
-};
-
-template <class _Operation1, class _Operation2, class _Operation3>
-inline ll_binary_compose<_Operation1, _Operation2, _Operation3>
-llcompose2(const _Operation1& __op1, const _Operation2& __op2,
- const _Operation3& __op3)
-{
- return ll_binary_compose<_Operation1,_Operation2,_Operation3>
- (__op1, __op2, __op3);
-}
-
-// helpers to deal with the fact that MSDev does not package
-// bind... with the stl. Again, this is from sgi.
-template <class _Operation>
-class llbinder1st :
- public std::unary_function<typename _Operation::second_argument_type,
- typename _Operation::result_type> {
-protected:
- _Operation op;
- typename _Operation::first_argument_type value;
-public:
- llbinder1st(const _Operation& __x,
- const typename _Operation::first_argument_type& __y)
- : op(__x), value(__y) {}
- typename _Operation::result_type
- operator()(const typename _Operation::second_argument_type& __x) const {
- return op(value, __x);
- }
-};
-
-template <class _Operation, class _Tp>
-inline llbinder1st<_Operation>
-llbind1st(const _Operation& __oper, const _Tp& __x)
-{
- typedef typename _Operation::first_argument_type _Arg1_type;
- return llbinder1st<_Operation>(__oper, _Arg1_type(__x));
-}
-
-template <class _Operation>
-class llbinder2nd
- : public std::unary_function<typename _Operation::first_argument_type,
- typename _Operation::result_type> {
-protected:
- _Operation op;
- typename _Operation::second_argument_type value;
-public:
- llbinder2nd(const _Operation& __x,
- const typename _Operation::second_argument_type& __y)
- : op(__x), value(__y) {}
- typename _Operation::result_type
- operator()(const typename _Operation::first_argument_type& __x) const {
- return op(__x, value);
- }
-};
-
-template <class _Operation, class _Tp>
-inline llbinder2nd<_Operation>
-llbind2nd(const _Operation& __oper, const _Tp& __x)
-{
- typedef typename _Operation::second_argument_type _Arg2_type;
- return llbinder2nd<_Operation>(__oper, _Arg2_type(__x));
-}
/**
* Compare std::type_info* pointers a la std::less. We break this out as a
diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp
index 8dbe2f84117c0f1eb2f3bf10b6d41e7e8b4aff30..e6e3145e275892ff27a6e0a0f597ec5c21ff22c5 100755
--- a/indra/llmessage/llcircuit.cpp
+++ b/indra/llmessage/llcircuit.cpp
@@ -437,11 +437,7 @@ LLCircuit::LLCircuit(const F32Seconds circuit_heartbeat_interval, const F32Secon
LLCircuit::~LLCircuit()
{
// delete pointers in the map.
- std::for_each(mCircuitData.begin(),
- mCircuitData.end(),
- llcompose1(
- DeletePointerFunctor<LLCircuitData>(),
- llselect2nd<circuit_data_map::value_type>()));
+ delete_and_clear(mCircuitData);
}
LLCircuitData *LLCircuit::addCircuitData(const LLHost &host, TPACKETID in_id)
diff --git a/indra/llmessage/lldispatcher.cpp b/indra/llmessage/lldispatcher.cpp
index c40fe0d3891404d0cd1052d56658b50c4012fa0a..c41d8f11e395e7129df616c254ebd772f9896406 100755
--- a/indra/llmessage/lldispatcher.cpp
+++ b/indra/llmessage/lldispatcher.cpp
@@ -58,11 +58,10 @@ bool LLDispatcher::isHandlerPresent(const key_t& name) const
void LLDispatcher::copyAllHandlerNames(keys_t& names) const
{
// copy the names onto the vector we are given
- std::transform(
- mHandlers.begin(),
- mHandlers.end(),
- std::back_insert_iterator<keys_t>(names),
- llselect1st<dispatch_map_t::value_type>());
+ for (auto& handle_pair : mHandlers)
+ {
+ names.push_back(handle_pair.first);
+ }
}
bool LLDispatcher::dispatch(
diff --git a/indra/llmessage/llsdrpcserver.cpp b/indra/llmessage/llsdrpcserver.cpp
index c3ed19889e83e5084f10296b1f9560a689b790e8..acf88c5e2e3b54fa77c17537ec33960020a3d5ba 100755
--- a/indra/llmessage/llsdrpcserver.cpp
+++ b/indra/llmessage/llsdrpcserver.cpp
@@ -62,18 +62,8 @@ LLSDRPCServer::LLSDRPCServer() :
LLSDRPCServer::~LLSDRPCServer()
{
- std::for_each(
- mMethods.begin(),
- mMethods.end(),
- llcompose1(
- DeletePointerFunctor<LLSDRPCMethodCallBase>(),
- llselect2nd<method_map_t::value_type>()));
- std::for_each(
- mCallbackMethods.begin(),
- mCallbackMethods.end(),
- llcompose1(
- DeletePointerFunctor<LLSDRPCMethodCallBase>(),
- llselect2nd<method_map_t::value_type>()));
+ delete_and_clear(mMethods);
+ delete_and_clear(mCallbackMethods);
}
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 3b1dca52d24946a06d759469753689b3905080a8..e1cbe7faa1b91f6b1ff68e27c494e12c79536059 100755
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -790,7 +790,7 @@ void LLFavoritesBarCtrl::updateButtons()
{
//find last visible child to get the rightest button offset
child_list_const_reverse_iter_t last_visible_it = std::find_if(childs->rbegin(), childs->rend(),
- std::mem_fun(&LLView::getVisible));
+ std::mem_fn(&LLView::getVisible));
if(last_visible_it != childs->rend())
{
last_right_edge = (*last_visible_it)->getRect().mRight;
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index cfe9fab486dc1926a2bc6eba53b072fed481266d..57d518cb9c1c58d9003d573510aadc617c1bbe67 100755
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -754,14 +754,6 @@ S32 LLGestureMgr::getPlayingCount() const
}
-struct IsGesturePlaying : public std::unary_function<LLMultiGesture*, bool>
-{
- bool operator()(const LLMultiGesture* gesture) const
- {
- return gesture->mPlaying ? true : false;
- }
-};
-
void LLGestureMgr::update()
{
S32 i;
@@ -773,9 +765,8 @@ void LLGestureMgr::update()
// Clear out gestures that are done, by moving all the
// ones that are still playing to the front.
std::vector<LLMultiGesture*>::iterator new_end;
- new_end = std::partition(mPlaying.begin(),
- mPlaying.end(),
- IsGesturePlaying());
+ new_end = std::partition(mPlaying.begin(), mPlaying.end(),
+ [](const LLMultiGesture* gesture) { return gesture->mPlaying ? true : false; });
// Something finished playing
if (new_end != mPlaying.end())
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp
index 99bcc221f8d1dc3fc27381b733db182db8cc7959..6ec961bfdb844d4fb18e491a136ed7e34650a214 100755
--- a/indra/newview/llwatchdog.cpp
+++ b/indra/newview/llwatchdog.cpp
@@ -225,7 +225,7 @@ void LLWatchdog::run()
LL_INFOS() << "Watchdog thread delayed: resetting entries." << LL_ENDL;
std::for_each(mSuspects.begin(),
mSuspects.end(),
- std::mem_fun(&LLWatchdogEntry::reset)
+ std::mem_fn(&LLWatchdogEntry::reset)
);
}
else
@@ -233,7 +233,7 @@ void LLWatchdog::run()
SuspectsRegistry::iterator result =
std::find_if(mSuspects.begin(),
mSuspects.end(),
- std::not1(std::mem_fun(&LLWatchdogEntry::isAlive))
+ std::not1(std::mem_fn(&LLWatchdogEntry::isAlive))
);
if(result != mSuspects.end())