diff options
author | 2017-03-31 18:07:35 +0200 | |
---|---|---|
committer | 2017-04-04 02:02:56 +0200 | |
commit | 58aa97913fa966b03d3b5bed77c6670e49821f1e (patch) | |
tree | 22aa0c6d2a40ed4a751226ae33d28db6ae149be3 /src/lib/netlist/plib/putil.cpp | |
parent | 9e78adc115a11d4495d291b10d5177a9d06d62f2 (diff) |
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)
Diffstat (limited to 'src/lib/netlist/plib/putil.cpp')
-rw-r--r-- | src/lib/netlist/plib/putil.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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<std::size_t>(-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<pstring::difference_type>(onstrl[p].len())); + i = std::next(i, static_cast<pstring::difference_type>(onstrl[p].length())); } else { |