diff options
author | Chris Johns <chrisj@rtems.org> | 2014-09-06 20:17:56 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2014-09-06 20:17:56 +1000 |
commit | 3eb00648c06a63504d2bca0028075dff2715d5e1 (patch) | |
tree | b24e197cb52eb7402c386531a3a5c0c55dc8e9ca /rld.h | |
parent | a13d0cb38bd94d1963cd62a9c6638bfb5143722e (diff) |
Add a path str. Remove the duplicate split call.
Diffstat (limited to 'rld.h')
-rw-r--r-- | rld.h | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -38,12 +38,14 @@ */ #if __WIN32__ #define RLD_PATH_SEPARATOR '\\' +#define RLD_PATH_SEPARATOR_STR "\\" #define RLD_PATHSTR_SEPARATOR ';' #define RLD_PATHSTR_SEPARATOR_STR ";" #define RLD_DRIVE_SEPARATOR (1) #define RLD_LINE_SEPARATOR "\r\n" #else #define RLD_PATH_SEPARATOR '/' +#define RLD_PATH_SEPARATOR_STR "/" #define RLD_PATHSTR_SEPARATOR ':' #define RLD_PATHSTR_SEPARATOR_STR ":" #define RLD_DRIVE_SEPARATOR (0) @@ -201,12 +203,12 @@ namespace rld * * @todo The split should optionally honour string quoting. */ - inline strings& split (strings& se, - const std::string& s, - char delimiter = ' ', - bool strip_quotes = true, - bool strip_whitespace = true, - bool empty = false) + inline strings split (strings& se, + const std::string& s, + char delimiter = ' ', + bool strip_quotes = true, + bool strip_whitespace = true, + bool empty = false) { std::stringstream ss(s); std::string e; @@ -280,11 +282,6 @@ namespace rld typedef std::vector < std::string > strings; /** - * Split a string into strings by the separator. - */ - void split (const std::string& str, strings& strs, char separator); - - /** * Map of the symbol table. */ void map (rld::files::cache& cache, rld::symbols::table& symbols); |