Changeset 380 for trunk/src/stl

Timestamp:

05/29/15 17:28:16 (10 years ago)

Author:

epyon

Message:

• oops, missed src : got rid of to_string and other std::string utilities (except slurp) string no longer in nv namespace

File:

• trunk/src/stl/string.cc (modified) (4 diffs)

trunk/src/stl/string.cc

@@ -97 +97 @@
 {
 #if NV_COMPILER == NV_MSVC
-        sprintf_s( str, 64, "%.*g", 6, n );
+        int result = sprintf_s( str, 64, "%.*g", 6, n );
 #else
-        snprintf( str, 64, "%.*g", 6, n );
+        int result = snprintf( str, 64, "%.*g", 6, n );
 #endif
-        sprintf( str, "%g", n );
-        return strlen( str );
+        return result > 0 ? ( nv::size_t )result : 0;
 }
 
@@ -108 +107 @@
 {
 #if NV_COMPILER == NV_MSVC
-        sprintf_s( str, 64, "%.*g", 6, n );
+        int result = sprintf_s( str, 64, "%.*g", 6, n );
 #else
-        snprintf( str, 64, "%.*g", 6, n );
+        int result = snprintf( str, 64, "%.*g", 6, n );
 #endif
-        return strlen( str );
+        return result > 0 ? ( nv::size_t )result : 0;
 }
 
@@ -162 +161 @@
         while ( *s >= '0' && *s <= '9' )
         {
-                result = ( result * 10 ) + ( *s - '0' );
+                result = ( result * 10 ) + (uint32)( *s - '0' );
                 ++s;
         }
@@ -175 +174 @@
         while ( *s >= '0' && *s <= '9' )
         {
-                result = ( result * 10 ) + ( *s - '0' );
+                result = ( result * 10 ) + (uint32)( *s - '0' );
                 ++s;
         }