Browse Source

ObjTools: Update getName() to work with const iterators.

Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
Andrew Parlane 9 years ago
parent
commit
c7d86e97cc
1 changed files with 3 additions and 3 deletions
  1. 3 3
      code/ObjTools.h

+ 3 - 3
code/ObjTools.h

@@ -141,7 +141,7 @@ inline char_t getName( char_t it, char_t end, std::string &name )
         return end;
     }
 
-    char *pStart = &( *it );
+    char_t pStart = it;
     while( !isEndOfBuffer( it, end ) && !IsLineEnd( *it ) ) {
         ++it;
     }
@@ -153,10 +153,10 @@ inline char_t getName( char_t it, char_t end, std::string &name )
 
     // Get name
     // if there is no name, and the previous char is a separator, come back to start
-    while (&(*it) < pStart) {
+    while (it < pStart) {
         ++it;
     }
-    std::string strName( pStart, &(*it) );
+    std::string strName( pStart, it );
     if ( strName.empty() )
         return it;
     else