Changeset 376 for trunk/src/io/c_stream.cc

Timestamp:

05/28/15 10:21:10 (10 years ago)

Author:

epyon

Message:

• stl/assert.hh, stl/capi.hh, size_t independent
• GCC 4.8 compatibility
• using template usage
• various minor changes

File:

• trunk/src/io/c_stream.cc (modified) (4 diffs)

trunk/src/io/c_stream.cc

@@ -3 +3 @@
 // For conditions of distribution and use, see copyright notice in nv.hh
 
+#include "nv/io/c_stream.hh"
 #include <cstdio>
 #include <sys/stat.h> 
-#include "nv/io/c_stream.hh"
 
 using namespace nv;
@@ -33 +33 @@
 }
 
-size_t c_stream::read( void* buffer, size_t size, size_t count )
+nv::size_t c_stream::read( void* buffer, nv::size_t size, nv::size_t count )
 {
         NV_ASSERT( buffer != nullptr && size != 0 && count != 0, "Bad parameter passed to read!" );
@@ -39 +39 @@
 }
 
-size_t c_stream::write( const void* buffer, size_t size, size_t count )
+nv::size_t c_stream::write( const void* buffer, nv::size_t size, nv::size_t count )
 {
         NV_ASSERT( buffer != nullptr && size != 0 && count != 0, "Bad parameter passed to write!" );
@@ -50 +50 @@
 }
 
-size_t c_stream::tell()
+nv::size_t c_stream::tell()
 {
-        return m_file != nullptr ? static_cast< size_t >( ::ftell( (FILE*)m_file ) ) : 0;
+        return m_file != nullptr ? static_cast< nv::size_t >( ::ftell( (FILE*)m_file ) ) : 0;
 }
 
-size_t c_stream::size()
+nv::size_t c_stream::size()
 {
         if ( m_file == nullptr || m_file_name == nullptr )