Merge branch 'develop' into feat/doctest-poc-clean

Author: mayconbekkers

indra/llcharacter/llmotion.cpp

@@ -51,8 +51,8 @@ LLMotion::LLMotion( const LLUUID &id ) :
     mSendStopTimestamp(F32_MAX),
     mResidualWeight(0.f),
     mFadeWeight(1.f),
-    mDeactivateCallback(NULL),
-    mDeactivateCallbackUserData(NULL)
+    mDeactivateCallback(nullptr),
+    mDeactivateCallbackUserData(nullptr)
 {
     for (S32 i=0; i<3; ++i)
         memset(&mJointSignature[i][0], 0, sizeof(U8) * LL_CHARACTER_MAX_ANIMATED_JOINTS);

indra/llcharacter/llmultigesture.h

@@ -54,11 +54,10 @@ class LLMultiGesture
     void reset();
 
     const std::string& getTrigger() const { return mTrigger; }
-protected:
-    LLMultiGesture(const LLMultiGesture& gest);
-    const LLMultiGesture& operator=(const LLMultiGesture& rhs);
 
-public:
+    LLMultiGesture(const LLMultiGesture& gest) = delete;
+    const LLMultiGesture& operator=(const LLMultiGesture& rhs) = delete;
+
     KEY mKey { 0 };
     MASK mMask { 0 };
 

indra/llcharacter/llvisualparam.h

@@ -30,7 +30,8 @@
 #include "v3math.h"
 #include "llstring.h"
 #include "llxmltree.h"
-#include <boost/function.hpp>
+
+#include <functional>
 
 class LLPolyMesh;
 class LLXmlTreeNode;
@@ -104,7 +105,7 @@ LL_ALIGN_PREFIX(16)
 class LLVisualParam
 {
 public:
-    typedef boost::function<LLVisualParam*(S32)> visual_param_mapper;
+    typedef std::function<LLVisualParam*(S32)> visual_param_mapper;
 
     LLVisualParam();
     virtual ~LLVisualParam();

indra/llcommon/llapr.h

@@ -33,7 +33,6 @@
 #include <sys/param.h>  // Need PATH_MAX in APR headers...
 #endif
 
-#include <boost/noncopyable.hpp>
 #include "llwin32headers.h"
 #include "apr_thread_proc.h"
 #include "apr_getopt.h"
@@ -145,17 +144,20 @@ class LL_COMMON_API LLVolatileAPRPool : public LLAPRPool
 //      2, a global pool.
 //
 
-class LL_COMMON_API LLAPRFile : boost::noncopyable
+class LL_COMMON_API LLAPRFile
 {
     // make this non copyable since a copy closes the file
 private:
     apr_file_t* mFile ;
     LLVolatileAPRPool *mCurrentFilePoolp ; //currently in use apr_pool, could be one of them: sAPRFilePoolp, or a temp pool.
 
 public:
-    LLAPRFile() ;
+    LLAPRFile();
     LLAPRFile(const std::string& filename, apr_int32_t flags, LLVolatileAPRPool* pool = NULL);
-    ~LLAPRFile() ;
+    ~LLAPRFile();
+
+    LLAPRFile(const LLAPRFile&) = delete;
+    LLAPRFile& operator=(const LLAPRFile&) = delete;
 
     apr_status_t open(const std::string& filename, apr_int32_t flags, LLVolatileAPRPool* pool = NULL, S32* sizep = NULL);
     apr_status_t open(const std::string& filename, apr_int32_t flags, bool use_global_pool); //use gAPRPoolp.

indra/llcommon/llcallbacklist.h

@@ -27,8 +27,9 @@
 #ifndef LL_LLCALLBACKLIST_H
 #define LL_LLCALLBACKLIST_H
 
-#include "llstl.h"
-#include <boost/function.hpp>
+#include "stdtypes.h"
+
+#include <functional>
 #include <list>
 
 class LLCallbackList
@@ -59,8 +60,8 @@ class LLCallbackList
     callback_list_t mCallbackList;
 };
 
-typedef boost::function<void ()> nullary_func_t;
-typedef boost::function<bool ()> bool_func_t;
+typedef std::function<void ()> nullary_func_t;
+typedef std::function<bool ()> bool_func_t;
 
 // Call a given callable once in idle loop.
 void doOnIdleOneTime(nullary_func_t callable);

indra/llcommon/llcoros.h

@@ -37,7 +37,7 @@
 #include "mutex.h"
 #include "llsingleton.h"
 #include "llinstancetracker.h"
-#include <boost/function.hpp>
+#include <functional>
 #include <string>
 #include <exception>
 #include <queue>
@@ -112,7 +112,7 @@ class LL_COMMON_API LLCoros: public LLSingleton<LLCoros>
     /// stuck with the term "coroutine."
     typedef boost::fibers::fiber coro;
     /// Canonical callable type
-    typedef boost::function<void()> callable_t;
+    typedef std::function<void()> callable_t;
 
     /**
      * Create and start running a new coroutine with specified name. The name

indra/llcommon/lldeadmantimer.h

@@ -99,13 +99,10 @@ class LL_COMMON_API LLDeadmanTimer
     ///                 during updates.  If false, cpu usage data isn't
     ///                 collected and will be zero if queried.
     LLDeadmanTimer(F64 horizon, bool inc_cpu);
+    ~LLDeadmanTimer() = default;
 
-    ~LLDeadmanTimer()
-        {}
-
-private:
-    LLDeadmanTimer(const LLDeadmanTimer &);             // Not defined
-    void operator=(const LLDeadmanTimer &);             // Not defined
+    LLDeadmanTimer(const LLDeadmanTimer &) = delete;
+    LLDeadmanTimer& operator=(const LLDeadmanTimer&) = delete;
 
 public:
     /// Get the current time.  Zero-basis for this time

indra/llcommon/lldependencies.h

@@ -30,6 +30,7 @@
 #if ! defined(LL_LLDEPENDENCIES_H)
 #define LL_LLDEPENDENCIES_H
 
+#include <functional>
 #include <string>
 #include <vector>
 #include <set>
@@ -38,7 +39,6 @@
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <boost/range/iterator_range.hpp>
-#include <boost/function.hpp>
 #include <boost/bind.hpp>
 #include "llexception.h"
 
@@ -217,7 +217,7 @@ class LLDependencies: public LLDependenciesBase
     /// We have various ways to get the dependencies for a given DepNode.
     /// Rather than having to restate each one for 'after' and 'before'
     /// separately, pass a dep_selector so we can apply each to either.
-    typedef boost::function<const typename DepNode::dep_set&(const DepNode&)> dep_selector;
+    typedef std::function<const typename DepNode::dep_set&(const DepNode&)> dep_selector;
 
 public:
     LLDependencies() {}
@@ -340,7 +340,7 @@ class LLDependencies: public LLDependenciesBase
 
 public:
     /// iterator over value_type entries
-    typedef boost::transform_iterator<boost::function<value_type(DepNodeMapEntry&)>,
+    typedef boost::transform_iterator<std::function<value_type(DepNodeMapEntry&)>,
                                       typename DepNodeMap::iterator> iterator;
     /// range over value_type entries
     typedef boost::iterator_range<iterator> range;
@@ -352,7 +352,7 @@ class LLDependencies: public LLDependenciesBase
     }
 
     /// iterator over const_value_type entries
-    typedef boost::transform_iterator<boost::function<const_value_type(const DepNodeMapEntry&)>,
+    typedef boost::transform_iterator<std::function<const_value_type(const DepNodeMapEntry&)>,
                                       typename DepNodeMap::const_iterator> const_iterator;
     /// range over const_value_type entries
     typedef boost::iterator_range<const_iterator> const_range;
@@ -364,7 +364,7 @@ class LLDependencies: public LLDependenciesBase
     }
 
     /// iterator over stored NODEs
-    typedef boost::transform_iterator<boost::function<NODE&(DepNodeMapEntry&)>,
+    typedef boost::transform_iterator<std::function<NODE&(DepNodeMapEntry&)>,
                                       typename DepNodeMap::iterator> node_iterator;
     /// range over stored NODEs
     typedef boost::iterator_range<node_iterator> node_range;
@@ -380,7 +380,7 @@ class LLDependencies: public LLDependenciesBase
     }
 
     /// const iterator over stored NODEs
-    typedef boost::transform_iterator<boost::function<const NODE&(const DepNodeMapEntry&)>,
+    typedef boost::transform_iterator<std::function<const NODE&(const DepNodeMapEntry&)>,
                                       typename DepNodeMap::const_iterator> const_node_iterator;
     /// const range over stored NODEs
     typedef boost::iterator_range<const_node_iterator> const_node_range;
@@ -396,7 +396,7 @@ class LLDependencies: public LLDependenciesBase
     }
 
     /// const iterator over stored KEYs
-    typedef boost::transform_iterator<boost::function<const KEY&(const DepNodeMapEntry&)>,
+    typedef boost::transform_iterator<std::function<const KEY&(const DepNodeMapEntry&)>,
                                       typename DepNodeMap::const_iterator> const_key_iterator;
     /// const range over stored KEYs
     typedef boost::iterator_range<const_key_iterator> const_key_range;

indra/llcommon/lldoubledispatch.h

@@ -30,9 +30,7 @@
 #define LL_LLDOUBLEDISPATCH_H
 
 #include <list>
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
-#include <boost/ref.hpp>
+#include <functional>
 
 /**
  * This class supports function calls which are virtual on the dynamic type of
@@ -156,9 +154,9 @@ class LLDoubleDispatch
         insert(t1, t2, func);
         if (symmetrical)
         {
-            // Use boost::bind() to construct a param-swapping thunk. Don't
+            // Use std::bind() to construct a param-swapping thunk. Don't
             // forget to reverse the parameters too.
-            insert(t2, t1, boost::bind(func, _2, _1));
+            insert(t2, t1, std::bind(func, std::placeholders::_2, std::placeholders::_1));
         }
     }
 
@@ -193,7 +191,7 @@ class LLDoubleDispatch
         insert(Type<Type1>(), Type<Type2>(), func, insertion);
         if (symmetrical)
         {
-            insert(Type<Type2>(), Type<Type1>(), boost::bind(func, _2, _1), insertion);
+            insert(Type<Type2>(), Type<Type1>(), std::bind(func, std::placeholders::_2, std::placeholders::_1), insertion);
         }
     }
 
@@ -271,8 +269,8 @@ class LLDoubleDispatch
     typename DispatchTable::iterator find(const ParamBaseType& param1, const ParamBaseType& param2)
     {
         return std::find_if(mDispatch.begin(), mDispatch.end(),
-                            boost::bind(&EntryBase::matches, _1,
-                                        boost::ref(param1), boost::ref(param2)));
+                            std::bind(&EntryBase::matches, std::placeholders::_1,
+                                        std::ref(param1), std::ref(param2)));
     }
 
     /// Look up the first matching entry.

indra/llcommon/llerror.cpp

@@ -527,8 +527,8 @@ namespace
         mFileLevelMap(),
         mTagLevelMap(),
         mUniqueLogMessages(),
-        mCrashFunction(NULL),
-        mTimeFunction(NULL),
+        mCrashFunction(nullptr),
+        mTimeFunction(nullptr),
         mRecorders(),
         mShouldLogCallCounter(0)
     {
@@ -1231,7 +1231,7 @@ namespace
 
             std::ostringstream message_stream;
 
-            if (r->wantsTime() && s->mTimeFunction != NULL)
+            if (r->wantsTime() && s->mTimeFunction != nullptr)
             {
                 message_stream << s->mTimeFunction();
             }