Changeset 52c5bf2 in nscp for include/strEx.h

Timestamp:

06/16/12 13:46:31 (11 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

7c1a8da

Parents:

c3f233d (diff), 482e07e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into 0.4.1

Conflicts:

changelog
include/nscapi/nscapi_helper.cpp
version.hpp
version.txt

File:

• include/strEx.h (modified) (1 diff)

include/strEx.h

@@ -92 +92 @@
       ss << std::noshowpoint << std::fixed << i;
       std::string s = ss.str();
-      std::string::size_type pos = s.find_last_not_of('0');
+      std::string::size_type pos = s.find('.');
+      if (pos != std::string::npos && (s.length()-pos) > 6) {
+        s = s.substr(0, pos+6);
+      }
+      
+      pos = s.find_last_not_of('0');
       if (pos == std::wstring::npos)
         return s;