| Index: base/string_split.h
|
| ===================================================================
|
| --- base/string_split.h (revision 95578)
|
| +++ base/string_split.h (working copy)
|
| @@ -10,7 +10,7 @@
|
| #include <utility>
|
| #include <vector>
|
|
|
| -#include "base/base_api.h"
|
| +#include "base/base_export.h"
|
| #include "base/string16.h"
|
|
|
| namespace base {
|
| @@ -21,48 +21,48 @@
|
| //
|
| // Every substring is trimmed of any leading or trailing white space.
|
| // NOTE: |c| must be in BMP (Basic Multilingual Plane)
|
| -BASE_API void SplitString(const string16& str,
|
| - char16 c,
|
| - std::vector<string16>* r);
|
| +BASE_EXPORT void SplitString(const string16& str,
|
| + char16 c,
|
| + std::vector<string16>* r);
|
| // |str| should not be in a multi-byte encoding like Shift-JIS or GBK in which
|
| // the trailing byte of a multi-byte character can be in the ASCII range.
|
| // UTF-8, and other single/multi-byte ASCII-compatible encodings are OK.
|
| // Note: |c| must be in the ASCII range.
|
| -BASE_API void SplitString(const std::string& str,
|
| - char c,
|
| - std::vector<std::string>* r);
|
| +BASE_EXPORT void SplitString(const std::string& str,
|
| + char c,
|
| + std::vector<std::string>* r);
|
|
|
| -BASE_API bool SplitStringIntoKeyValues(
|
| +BASE_EXPORT bool SplitStringIntoKeyValues(
|
| const std::string& line,
|
| char key_value_delimiter,
|
| std::string* key, std::vector<std::string>* values);
|
|
|
| -BASE_API bool SplitStringIntoKeyValuePairs(
|
| +BASE_EXPORT bool SplitStringIntoKeyValuePairs(
|
| const std::string& line,
|
| char key_value_delimiter,
|
| char key_value_pair_delimiter,
|
| std::vector<std::pair<std::string, std::string> >* kv_pairs);
|
|
|
| // The same as SplitString, but use a substring delimiter instead of a char.
|
| -BASE_API void SplitStringUsingSubstr(const string16& str,
|
| - const string16& s,
|
| - std::vector<string16>* r);
|
| -BASE_API void SplitStringUsingSubstr(const std::string& str,
|
| - const std::string& s,
|
| - std::vector<std::string>* r);
|
| +BASE_EXPORT void SplitStringUsingSubstr(const string16& str,
|
| + const string16& s,
|
| + std::vector<string16>* r);
|
| +BASE_EXPORT void SplitStringUsingSubstr(const std::string& str,
|
| + const std::string& s,
|
| + std::vector<std::string>* r);
|
|
|
| // The same as SplitString, but don't trim white space.
|
| // NOTE: |c| must be in BMP (Basic Multilingual Plane)
|
| -BASE_API void SplitStringDontTrim(const string16& str,
|
| - char16 c,
|
| - std::vector<string16>* r);
|
| +BASE_EXPORT void SplitStringDontTrim(const string16& str,
|
| + char16 c,
|
| + std::vector<string16>* r);
|
| // |str| should not be in a multi-byte encoding like Shift-JIS or GBK in which
|
| // the trailing byte of a multi-byte character can be in the ASCII range.
|
| // UTF-8, and other single/multi-byte ASCII-compatible encodings are OK.
|
| // Note: |c| must be in the ASCII range.
|
| -BASE_API void SplitStringDontTrim(const std::string& str,
|
| - char c,
|
| - std::vector<std::string>* r);
|
| +BASE_EXPORT void SplitStringDontTrim(const std::string& str,
|
| + char c,
|
| + std::vector<std::string>* r);
|
|
|
| // WARNING: this uses whitespace as defined by the HTML5 spec. If you need
|
| // a function similar to this but want to trim all types of whitespace, then
|
| @@ -72,12 +72,12 @@
|
| // Splits the string along whitespace (where whitespace is the five space
|
| // characters defined by HTML 5). Each contiguous block of non-whitespace
|
| // characters is added to result.
|
| -BASE_API void SplitStringAlongWhitespace(const std::wstring& str,
|
| - std::vector<std::wstring>* result);
|
| -BASE_API void SplitStringAlongWhitespace(const string16& str,
|
| - std::vector<string16>* result);
|
| -BASE_API void SplitStringAlongWhitespace(const std::string& str,
|
| - std::vector<std::string>* result);
|
| +BASE_EXPORT void SplitStringAlongWhitespace(const std::wstring& str,
|
| + std::vector<std::wstring>* result);
|
| +BASE_EXPORT void SplitStringAlongWhitespace(const string16& str,
|
| + std::vector<string16>* result);
|
| +BASE_EXPORT void SplitStringAlongWhitespace(const std::string& str,
|
| + std::vector<std::string>* result);
|
|
|
| } // namespace base
|
|
|
|
|