From 1c0d74fc002f98784a1a72299e9e15ceffde47b2 Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Thu, 25 Jul 2013 02:52:52 +0200
Subject: [PATCH] Unix build fixes.

--HG--
branch : gsoc2013-dfighter
---
 code/nel/include/nel/3d/shader_manager.h |  4 ++--
 code/nel/src/3d/shader_manager.cpp       | 16 ++++++++--------
 code/nel/src/misc/variant.cpp            |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/code/nel/include/nel/3d/shader_manager.h b/code/nel/include/nel/3d/shader_manager.h
index 7158a5ea4..428a1f3f0 100644
--- a/code/nel/include/nel/3d/shader_manager.h
+++ b/code/nel/include/nel/3d/shader_manager.h
@@ -18,7 +18,7 @@
 #ifndef SHADER_MANAGER_H
 #define SHADER_MANAGER_H
 
-#include <unordered_map>
+#include <map>
 #include <vector>
 #include <string>
 
@@ -42,7 +42,7 @@ namespace NL3D
 		void visitShader( const std::string &name, IShaderVisitor *visitor );
 
 	private:
-		std::tr1::unordered_map< std::string, CShaderProgram* > programs;
+		std::map< std::string, CShaderProgram* > programs;
 	};
 }
 
diff --git a/code/nel/src/3d/shader_manager.cpp b/code/nel/src/3d/shader_manager.cpp
index 3236aa280..966591e8f 100644
--- a/code/nel/src/3d/shader_manager.cpp
+++ b/code/nel/src/3d/shader_manager.cpp
@@ -33,7 +33,7 @@ namespace NL3D
 
 	void CShaderManager::clear()
 	{
-		std::tr1::unordered_map< std::string, CShaderProgram* >::iterator itr = programs.begin();
+		std::map< std::string, CShaderProgram* >::iterator itr = programs.begin();
 		while( itr != programs.end() )
 		{
 			delete itr->second;
@@ -47,7 +47,7 @@ namespace NL3D
 		v.clear();
 
 		std::string n;
-		std::tr1::unordered_map< std::string, CShaderProgram* >::iterator itr = programs.begin();
+		std::map< std::string, CShaderProgram* >::iterator itr = programs.begin();
 		while( itr != programs.end() )
 		{
 			itr->second->getName( n );
@@ -61,7 +61,7 @@ namespace NL3D
 		std::string n;
 		program->getName( n );
 
-		std::tr1::unordered_map< std::string, CShaderProgram* >::iterator itr
+		std::map< std::string, CShaderProgram* >::iterator itr
 			= programs.find( n );
 		if( itr != programs.end() )
 			return false;
@@ -72,7 +72,7 @@ namespace NL3D
 
 	bool CShaderManager::removeShader( const std::string &name )
 	{
-		std::tr1::unordered_map< std::string, CShaderProgram* >::iterator itr
+		std::map< std::string, CShaderProgram* >::iterator itr
 			= programs.find( name );
 		if( itr == programs.end() )
 			return false;
@@ -86,7 +86,7 @@ namespace NL3D
 
 	bool CShaderManager::changeShader( const std::string &name, CShaderProgram *program )
 	{
-		std::tr1::unordered_map< std::string, CShaderProgram* >::iterator itr
+		std::map< std::string, CShaderProgram* >::iterator itr
 			= programs.find( name );
 		if( itr == programs.end() )
 			return false;
@@ -111,7 +111,7 @@ namespace NL3D
 
 	bool CShaderManager::getShader( const std::string &name, CShaderProgram *program )
 	{
-		std::tr1::unordered_map< std::string, CShaderProgram* >::iterator itr
+		std::map< std::string, CShaderProgram* >::iterator itr
 			= programs.find( name );
 		if( itr == programs.end() )
 			return false;
@@ -135,7 +135,7 @@ namespace NL3D
 
 	void CShaderManager::visitShaders( IShaderVisitor *visitor )
 	{
-		std::tr1::unordered_map< std::string, CShaderProgram* >::iterator itr = programs.begin();
+		std::map< std::string, CShaderProgram* >::iterator itr = programs.begin();
 		while( itr != programs.end() )
 		{
 			visitor->visit( itr->second );
@@ -145,7 +145,7 @@ namespace NL3D
 
 	void CShaderManager::visitShader( const std::string &name, IShaderVisitor *visitor )
 	{
-		std::tr1::unordered_map< std::string, CShaderProgram* >::iterator itr =
+		std::map< std::string, CShaderProgram* >::iterator itr =
 			programs.find( name );
 		if( itr == programs.end() )
 			return;
diff --git a/code/nel/src/misc/variant.cpp b/code/nel/src/misc/variant.cpp
index 1689775a5..7ab3a49d4 100644
--- a/code/nel/src/misc/variant.cpp
+++ b/code/nel/src/misc/variant.cpp
@@ -286,7 +286,7 @@ namespace NLMISC
 
 		case Vector4:
 			{
-				std::stringstream ss = s;
+				std::stringstream ss( s );
 
 				for( int i = 0; i < 4; i++ )
 				{
@@ -300,7 +300,7 @@ namespace NLMISC
 
 		case Matrix4:
 			{
-				std::stringstream ss = s;
+				std::stringstream ss( s );
 
 				for( int i = 0; i < 16; i++ )
 				{