Changeset 378 for trunk/src/stl

Timestamp:

05/29/15 12:12:47 (10 years ago)

Author:

epyon

Message:

• important fix in reverse_iterator operators
• std::string functions removed or converted to string_ref in string.hh
• capi.hh - more function forwards and usage of them instead of libc
• more std removal
• assert fix

Location:

trunk/src/stl

Files:

• assert.cc (modified) (1 diff)
• string.cc (modified) (2 diffs)

trunk/src/stl/assert.cc

@@ -34 +34 @@
 }
 #       else
-#include <assert.h>
+extern "C" {
+        extern void __assert_fail(const char *, const char *, unsigned int, const char *)
+                throw() __attribute__ ((__noreturn__));
+}
 #       endif
 void nv_internal_assert( const char * assertion, const char * file, unsigned int line, const char * function )

trunk/src/stl/string.cc

@@ -11 +11 @@
 #include <cstdio>
 #include <cstdlib>
+#include <fstream> // for slurp only
 
 using namespace nv;
@@ -16 +17 @@
 static const double s_power_10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000,
 10000000, 100000000, 1000000000 };
+
+std::string nv::slurp( const std::string& filename )
+{
+        std::ifstream input( filename );
+        //              if ( !input.is_open() ) NV_THROW( std::runtime_error, "File "+filename+" not found!");
+        std::stringstream sstr;
+        while ( input >> sstr.rdbuf() );
+        return sstr.str();
+}
 
 static inline void string_reverse( char* begin, char* end )