OSDN Git Service

VC2010 does not accept a dot to serve as a class resolution operator
authorJochen Tucht <jtuc@users.sourceforge.net>
Sun, 16 May 2010 13:45:23 +0000 (13:45 +0000)
committerJochen Tucht <jtuc@users.sourceforge.net>
Sun, 16 May 2010 13:45:23 +0000 (13:45 +0000)
Src/Common/coretools.cpp

index 1e1a5b9..2a14185 100644 (file)
@@ -270,7 +270,7 @@ void SplitViewName(LPCTSTR s, String * path, String * name, String * ext)
 {
        String sViewName(s);
        size_t nOffset = sViewName.find(_T("@@"));
-       if (nOffset != std::string::npos)
+       if (nOffset != String::npos)
        {
                sViewName.erase(nOffset);
                SplitFilename(sViewName.c_str(), path, name, ext);
@@ -765,7 +765,7 @@ void GetDecoratedCmdLine(String sCmdLine, String &sDecoratedCmdLine,
                sCmdLine.erase(clpos, clpos - sCmdLine.length());
 
        std::string::size_type pos = sCmdLine.find(_T(" "));
-       if (pos != std::string.npos)
+       if (pos != String::npos)
        {
                // First space was before switch, we don't need "s
                // (executable path didn't contain spaces)
@@ -785,7 +785,7 @@ void GetDecoratedCmdLine(String sCmdLine, String &sDecoratedCmdLine,
                        prevPos = pos;
                        pos = sCmdLine.find(_T(" "), prevPos + 1);
 
-                       if (pos != std::string.npos)
+                       if (pos != String::npos)
                        {
                                if (sCmdLine[pos + 1] == '/' || sCmdLine[pos + 1] == '-')
                                {
@@ -800,7 +800,7 @@ void GetDecoratedCmdLine(String sCmdLine, String &sDecoratedCmdLine,
 
                if (addQuote)
                {
-                       if (pos != std::string.npos)
+                       if (pos != String::npos)
                        {
                                sExecutable = sCmdLine.substr(0, pos);
                                sDecoratedCmdLine += sExecutable;