Merge remote-tracking branch 'cosmy1/master'

Source/ThirdParty/kNet/include/kNet/Lockable.h

@@ -65,6 +65,7 @@ public:
 		value = rhs.value;
 
 		rhs.TearDown();
+        return *this;
 	}
 
 	~Lock()
@@ -120,6 +121,7 @@ public:
 		value = rhs.value;
 
 		rhs.TearDown();
+        return *this;
 	}
 
 	~ConstLock()

Source/Urho3D/Math/AreaAllocator.cpp

@@ -161,7 +161,7 @@ bool AreaAllocator::Allocate(int width, int height, int& x, int& y)
     return true;
 }
 
-bool AreaAllocator::SplitRect(IntRect original, const IntRect& reserve)
+bool AreaAllocator::SplitRect(const IntRect& original, const IntRect& reserve)
 {
     if (reserve.right_ > original.left_ && reserve.left_ < original.right_ && reserve.bottom_ > original.top_ &&
         reserve.top_ < original.bottom_)

Source/Urho3D/Math/AreaAllocator.h

@@ -54,7 +54,7 @@ public:
 
 private:
     /// Remove space from a free rectangle. Return true if the original rectangle should be erased from the free list. Not called in fast mode.
-    bool SplitRect(IntRect original, const IntRect& reserve);
+    bool SplitRect(const IntRect& original, const IntRect& reserve);
     /// Clean up redundant free space. Not called in fast mode.
     void Cleanup();
 

Source/Urho3D/Script/Script.h

@@ -114,7 +114,7 @@ private:
     /// Return a script function/method execution context for the current execution nesting level.
     asIScriptContext* GetScriptFileContext();
     /// Output a sanitated row of script API. No-ops when URHO3D_LOGGING not defined.
-    void OutputAPIRow(DumpMode mode, const String& row, bool removeReference = false, String separator = ";");
+    void OutputAPIRow(DumpMode mode, const String& row, bool removeReference = false, const String& separator = ";");
     /// Handle a console command event.
     void HandleConsoleCommand(StringHash eventType, VariantMap& eventData);
 

Source/Urho3D/Script/ScriptAPIDump.cpp

@@ -156,7 +156,7 @@ bool ComparePropertyInfos(const PropertyInfo& lhs, const PropertyInfo& rhs)
     return String::Compare(lhs.name_.CString(), rhs.name_.CString(), true) < 0;
 }
 
-void Script::OutputAPIRow(DumpMode mode, const String& row, bool removeReference, String separator)
+void Script::OutputAPIRow(DumpMode mode, const String& row, bool removeReference, const String& separator)
 {
     String out(row);
     out.Replace("&in", "&");