Index: trunk/src/lua/lua_handle.cc
===================================================================
--- trunk/src/lua/lua_handle.cc	(revision 364)
+++ trunk/src/lua/lua_handle.cc	(revision 365)
@@ -7,4 +7,5 @@
 #include "nv/lua/lua_handle.hh"
 
+#include "nv/core/logging.hh"
 #include "nv/lua/lua_state.hh"
 #include "nv/lua/lua_raw.hh"
@@ -18,5 +19,5 @@
 	if ( !lua_istable( L, -1 ) )
 	{
-		NV_LOG( nv::LOG_ERROR, "NIL" );
+		NV_LOG_ERROR( "NIL" );
 		lua_pop( L, 2 );
 		lua_pushnil( L );
Index: trunk/src/lua/lua_state.cc
===================================================================
--- trunk/src/lua/lua_state.cc	(revision 364)
+++ trunk/src/lua/lua_state.cc	(revision 365)
@@ -111,5 +111,5 @@
 	if ( !p.resolve( m_state, global ) )
 	{
-		NV_LOG( LOG_ERROR, "Lua error : not a valid path - " + p.to_string() );
+		NV_LOG_ERROR( "Lua error : not a valid path - ", p.to_string() );
 		return false;
 	}
@@ -118,5 +118,5 @@
 	{
 		lua_pop( m_state, 1 );
-		NV_LOG( LOG_ERROR, "Lua error : not a valid function - " + p.to_string() );
+		NV_LOG_ERROR( "Lua error : not a valid function - ", p.to_string() );
 		return false;
 	}
@@ -129,5 +129,5 @@
 	if ( status != 0 )
 	{
-		NV_LOG( LOG_ERROR, "Lua error : " << lua_tostring( m_state, -1 ) );
+		NV_LOG_ERROR( "Lua error : ", lua_tostring( m_state, -1 ) );
 		lua_pop( m_state, 1 );
 	}
@@ -144,5 +144,5 @@
 	if ( !p.resolve( m_state, global ) || lua_type(m_state, -1) != LUA_TTABLE )
 	{
-		NV_LOG( LOG_ERROR, "Could not resolve table!" );
+		NV_LOG_ERROR( "Could not resolve table!" );
 		// TODO : error handling
 	}
@@ -156,5 +156,5 @@
 	if ( !p.resolve( m_state, false ) || lua_type(m_state, -1) != LUA_TTABLE )
 	{
-		NV_LOG( LOG_ERROR, "Could not resolve table!" );
+		NV_LOG_ERROR( "Could not resolve table!" );
 		// TODO : error handling
 	}
@@ -347,10 +347,10 @@
 	}
 
-	NV_LOG( nv::LOG_TRACE, "Lua state created" );
+	NV_LOG_TRACE( "Lua state created" );
 }
 
 int lua::state::load_string( string_ref code, string_ref name )
 {
-	NV_LOG( nv::LOG_TRACE, "Loading Lua string '" << name << "'");
+	NV_LOG_TRACE( "Loading Lua string '", name, "'");
 	return luaL_loadbuffer( m_state, code.data(), code.length(), name.data() );
 }
@@ -358,5 +358,5 @@
 int lua::state::load_stream( std::istream& stream, string_ref name )
 {
-	NV_LOG( nv::LOG_NOTICE, "Loading Lua stream '" << name << "'");
+	NV_LOG_NOTICE( "Loading Lua stream '", name, "'");
 	return load_string( std::string(
 		(std::istreambuf_iterator<char>(stream)),
@@ -366,5 +366,5 @@
 int lua::state::load_file( string_ref filename )
 {
-	NV_LOG( nv::LOG_NOTICE, "Loading Lua file '" << filename << "'");
+	NV_LOG_NOTICE( "Loading Lua file '", filename, "'");
 	return luaL_loadfile( m_state, filename.data() );
 }
@@ -376,5 +376,5 @@
 	if (result)
 	{
-		NV_LOG( nv::LOG_WARNING, "Failed to load string " << name << ": " << lua_tostring(m_state, -1));
+		NV_LOG_WARNING( "Failed to load string ", name, ": ", lua_tostring(m_state, -1));
 		return false;
 	}
@@ -388,5 +388,5 @@
 	if (result)
 	{
-		NV_LOG( nv::LOG_WARNING, "Failed to open stream " << name << ": " << lua_tostring(m_state, -1));
+		NV_LOG_WARNING( "Failed to open stream ", name, ": ", lua_tostring( m_state, -1 ) );
 		return false;
 	}
@@ -400,5 +400,5 @@
 	if (result) 
 	{
-		NV_LOG( nv::LOG_WARNING, "Failed to open file " << filename << ": " << lua_tostring(m_state, -1));
+		NV_LOG_WARNING( "Failed to open file ", filename, ": ", lua_tostring( m_state, -1 ) );
 		return false;
 	}
@@ -411,5 +411,5 @@
 	if (result) 
 	{
-		NV_LOG( nv::LOG_WARNING, "Failed to run script " << name << ": " << lua_tostring(m_state, -1));
+		NV_LOG_WARNING( "Failed to run script ", name, ": ", lua_tostring( m_state, -1 ) );
 		lua_pop( m_state, 1 );
 	}
@@ -425,8 +425,8 @@
 {
 	int top = lua_gettop(m_state);
-	NV_LOG( LOG_DEBUG, "Stack dump (" << top << ")");
+	NV_LOG_DEBUG( "Stack dump (", top, ")");
 	for ( int i = 0; i < top; ++i )
 	{
-		NV_LOG( LOG_DEBUG, "#" << i+1 << " - " << lua_typename(m_state, lua_type(m_state, i+1) ) << " = " << nlua_typecontent(m_state, i+1) );
+		NV_LOG_DEBUG( "#", i+1, " - ", lua_typename(m_state, lua_type(m_state, i+1) ), " = ", nlua_typecontent(m_state, i+1) );
 	}
 }