Changeset 973 for cpp/frams/util/extvalue.cpp

Timestamp:

07/03/20 00:37:13 (4 years ago)

Author:

Maciej Komosinski

Message:

Increased SString and std::string compatibility: introduced length(), size(), and capacity(), and removed legacy methods that have std::string equivalents

File:

• cpp/frams/util/extvalue.cpp (modified) (4 diffs)

cpp/frams/util/extvalue.cpp

@@ -326 +326 @@
                 {
                         SString tmp = getString();
-                        if (tmp.len() > 30) tmp = tmp.substr(0, 30) + "...";
+                        if (tmp.length() > 30) tmp = tmp.substr(0, 30) + "...";
                         if (type == TString) tmp = SString("\"") + tmp + SString("\"");
                         logPrintf("ExtValue", "getObjectTarget", LOG_WARN, "%s object expected, %s found", classname, tmp.c_str());
@@ -614 +614 @@
                         return;
                 case TDouble:
-                        setDouble(double(getInt())*src.getDouble());
+                        setDouble(double(getInt()) * src.getDouble());
                         return;
                 default:;
@@ -790 +790 @@
         //            ^-cur     ^-next
         //            ^^^^^^^^^^___sub
-        const char* begin = fmt.c_str(), *end = begin + fmt.len(), *curr = begin;
+        const char* begin = fmt.c_str(), *end = begin + fmt.length(), *curr = begin;
         int type = 0;
 
@@ -1401 +1401 @@
         err->message = args[0].getString();
         if (err->message.startsWith(TO_STRING_PREFIX.c_str()))
-                err->message = err->message.substr(TO_STRING_PREFIX.len());
+                err->message = err->message.substr(TO_STRING_PREFIX.length());
         *ret = makeDynamicObject(err);
 }