From 58aa97913fa966b03d3b5bed77c6670e49821f1e Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 31 Mar 2017 18:07:35 +0200 Subject: pstring, pdynlib, pfmtlog refactoring : pstring: - added support for UTF16LE to pstring. - renamed size() to mem_t_size() - renmaed len() to length() - added size() == length() - added empty() - added simple compare() pfmtlog: - Simplified pfmtlog, added more c++ pdynlib: - add a dynproc type to dynlib to wrap dynamic library calls. various: - fix two coverty scan issue. - various clang warnings fixed. (nw) --- src/lib/netlist/plib/putil.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/netlist/plib/putil.cpp') diff --git a/src/lib/netlist/plib/putil.cpp b/src/lib/netlist/plib/putil.cpp index ddb300958ea..c34102417ec 100644 --- a/src/lib/netlist/plib/putil.cpp +++ b/src/lib/netlist/plib/putil.cpp @@ -50,15 +50,15 @@ namespace plib while (pn != pstring::npos) { pstring t = str.substr(p, pn - p); - if (!ignore_empty || t.len() != 0) + if (!ignore_empty || t.length() != 0) ret.push_back(t); - p = pn + onstr.len(); + p = pn + onstr.length(); pn = str.find(onstr, p); } - if (p < str.len()) + if (p < str.length()) { pstring t = str.substr(p); - if (!ignore_empty || t.len() != 0) + if (!ignore_empty || t.length() != 0) ret.push_back(t); } return ret; @@ -75,7 +75,7 @@ namespace plib std::size_t p = static_cast(-1); for (std::size_t j=0; j < onstrl.size(); j++) { - if (std::equal(onstrl[j].c_str(), onstrl[j].c_str() + onstrl[j].size(), i)) + if (std::equal(onstrl[j].begin(), onstrl[j].end(), i)) { p = j; break; @@ -88,7 +88,7 @@ namespace plib col = ""; ret.push_back(onstrl[p]); - i = std::next(i, static_cast(onstrl[p].len())); + i = std::next(i, static_cast(onstrl[p].length())); } else { -- cgit v1.2.3-70-g09d2