Changeset 367 for trunk/src/lua/lua_state.cc

Timestamp:

05/16/15 23:12:22 (10 years ago)

Author:

epyon

Message:

• fixed compilation and warnings on gcc
• slowly removing/merging external includes

File:

• trunk/src/lua/lua_state.cc (modified) (2 diffs)

trunk/src/lua/lua_state.cc

@@ -356 +356 @@
 }
 
-int lua::state::load_stream( std::istream& stream, string_ref name )
-{
-        NV_LOG_NOTICE( "Loading Lua stream '", name, "'");
-        return load_string( std::string(
-                (std::istreambuf_iterator<char>(stream)),
-                std::istreambuf_iterator<char>()), name );
-}
-
 int lua::state::load_file( string_ref filename )
 {
@@ -380 +372 @@
         }
         return do_current( name, rvalues ) == 0;
-}
-
-bool lua::state::do_stream( std::istream& stream, string_ref name )
-{
-        lua::stack_guard( this );
-        int result = load_stream(stream,name);
-        if (result)
-        {
-                NV_LOG_WARNING( "Failed to open stream ", name, ": ", lua_tostring( m_state, -1 ) );
-                return false;
-        }
-        return do_current( name ) == 0;
 }