Merge branch '0.5.x' into 0.6.0.x

Conflicts: src/main.h src/net.cpp src/util.cpp
2026-10-22 06:28:44 +02:00 · 2012-04-22 10:07:24 -04:00
parent c43a9ea77d a93ab87787
commit 66116c3847
12 changed files with 34 additions and 18 deletions
@@ -203,7 +203,7 @@ Value help(const Array& params, bool fHelp)
            // Help text is returned in an exception
            string strHelp = string(e.what());
            if (strCommand == "")
-                if (strHelp.find('\n') != -1)
+                if (strHelp.find('\n') != string::npos)
                    strHelp = strHelp.substr(0, strHelp.find('\n'));
            strRet += strHelp + "\n";
        }