X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fvertexformat.cpp;h=b9bd7b9402414f16ad3b0c70d11a835b12ef9c3f;hb=e20075bffbbe1f3aaa9cc149953525a7e855f496;hp=91084bcc273e0bff6524746b22372a10d7b88eee;hpb=e77c027ce8efb5dafd93bdd0f77504218a955665;p=libs%2Fgl.git diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp index 91084bcc..b9bd7b94 100644 --- a/source/vertexformat.cpp +++ b/source/vertexformat.cpp @@ -10,6 +10,8 @@ Distributed under the LGPL #include "except.h" #include "vertexformat.h" +using namespace std; + namespace Msp { namespace GL { @@ -102,16 +104,16 @@ uint get_stride(const VertexFormat &f) return stride; } -std::istream &operator>>(std::istream &in, VertexFormat &f) +istream &operator>>(istream &in, VertexFormat &f) { - std::string str; + string str; in>>str; unsigned start=0; while(1) { - unsigned underscore=str.find('_', start); + string::size_type underscore=str.find('_', start); bool fail=false; if(!str.compare(start, underscore-start, "VERTEX2")) f=(f,VERTEX2); @@ -162,11 +164,11 @@ std::istream &operator>>(std::istream &in, VertexFormat &f) if(fail) { - in.setstate(std::ios_base::failbit); + in.setstate(ios_base::failbit); break; } - if(underscore==std::string::npos) + if(underscore==string::npos) break; start=underscore+1; }