From 06bfd577a47163084e85956257340f825e85fee3 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Wed, 10 Feb 2016 18:48:09 +0100
Subject: [PATCH] Merge with develop

---
 code/nel/src/misc/log.cpp      | 6 +++---
 code/nel/src/misc/sheet_id.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/nel/src/misc/log.cpp b/code/nel/src/misc/log.cpp
index 2e7146fb6..9e5f0a1bc 100644
--- a/code/nel/src/misc/log.cpp
+++ b/code/nel/src/misc/log.cpp
@@ -260,7 +260,7 @@ void CLog::displayString (const char *str)
 			TempArgs.FileName = _FileName;
 			TempArgs.Line = _Line;
 			TempArgs.FuncName = _FuncName;
-			TempArgs.CallstackAndLog = "";
+			TempArgs.CallstackAndLog.clear();
 
 			TempString = str;
 		}
@@ -281,7 +281,7 @@ void CLog::displayString (const char *str)
 			localargs.FileName = _FileName;
 			localargs.Line = _Line;
 			localargs.FuncName = _FuncName;
-			localargs.CallstackAndLog = "";
+			localargs.CallstackAndLog.clear();
 
 			disp = str;
 			args = &localargs;
@@ -314,7 +314,7 @@ void CLog::displayString (const char *str)
 			(*idi)->display( *args, disp );
 		}
 	}
-	TempString = "";
+	TempString.clear();
 	unsetPosition();
 }
 
diff --git a/code/nel/src/misc/sheet_id.cpp b/code/nel/src/misc/sheet_id.cpp
index 690d09ab1..1b3ca490f 100644
--- a/code/nel/src/misc/sheet_id.cpp
+++ b/code/nel/src/misc/sheet_id.cpp
@@ -555,7 +555,7 @@ string CSheetId::toString(bool ifNotFoundUseNumericId) const
 		}
 		else
 		{
-			return NLMISC::toString( "<Sheet %d not found in sheet_id.bin>", _Id.Id );
+			return NLMISC::toString( "<Sheet %u not found in sheet_id.bin>", _Id.Id );
 		}
 	}