summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/plib/putil.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/plib/putil.h')
-rwxr-xr-x[-rw-r--r--]src/lib/netlist/plib/putil.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/lib/netlist/plib/putil.h b/src/lib/netlist/plib/putil.h
index 9e79e958927..4bc8dcd695f 100644..100755
--- a/src/lib/netlist/plib/putil.h
+++ b/src/lib/netlist/plib/putil.h
@@ -8,17 +8,18 @@
#ifndef P_UTIL_H_
#define P_UTIL_H_
-#include <initializer_list>
+#include "pstring.h"
-#include "plib/pstring.h"
-#include "plib/plists.h"
+#include <initializer_list>
+#include <algorithm>
+#include <vector> // <<= needed by windows build
namespace plib
{
namespace util
{
const pstring buildpath(std::initializer_list<pstring> list );
- const pstring environment(const pstring &var, const pstring &default_val = "");
+ const pstring environment(const pstring &var, const pstring &default_val);
}
namespace container
@@ -66,13 +67,8 @@ namespace plib
// string list
// ----------------------------------------------------------------------------------------
- class pstring_vector_t : public std::vector<pstring>
- {
- public:
- pstring_vector_t() : std::vector<pstring>() { }
- pstring_vector_t(const pstring &str, const pstring &onstr, bool ignore_empty = false);
- pstring_vector_t(const pstring &str, const pstring_vector_t &onstrl);
- };
+ std::vector<pstring> psplit(const pstring &str, const pstring &onstr, bool ignore_empty = false);
+ std::vector<pstring> psplit(const pstring &str, const std::vector<pstring> &onstrl);
}