Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp

1 files changed, 8 insertions, 4 deletions

diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index bf685ef20f..fd8034b811 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -77,12 +77,14 @@ public:
     virtual void replay(std::ostream&) {}
 };
 
-class RecordToTempFile : public LLError::Recorder, public boost::noncopyable
+class RecordToTempFile : public LLError::Recorder
 {
 public:
+    RecordToTempFile(const RecordToTempFile&)        = delete;
+    RecordToTempFile& operator=(const RecordToTempFile&) = delete;
+
     RecordToTempFile()
         : LLError::Recorder(),
-        boost::noncopyable(),
         mTempFile("log", ""),
         mFile(mTempFile.getName().c_str())
     {
@@ -121,12 +123,14 @@ private:
     llofstream mFile;
 };
 
-class LLReplayLogReal: public LLReplayLog, public boost::noncopyable
+class LLReplayLogReal: public LLReplayLog
 {
 public:
+    LLReplayLogReal(const LLReplayLogReal&)            = delete;
+    LLReplayLogReal& operator=(const LLReplayLogReal&) = delete;
+
     LLReplayLogReal(LLError::ELevel level)
         : LLReplayLog(),
-        boost::noncopyable(),
         mOldSettings(LLError::saveAndResetSettings()),
         mRecorder(new RecordToTempFile())
     {