Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1757)

Unified Diff: base/utf_string_conversions.h

Issue 7461141: Rename BASE_API to BASE_EXPORT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/utf_string_conversion_utils.h ('k') | base/value_conversions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/utf_string_conversions.h
===================================================================
--- base/utf_string_conversions.h (revision 95578)
+++ base/utf_string_conversions.h (working copy)
@@ -8,7 +8,7 @@
#include <string>
-#include "base/base_api.h"
+#include "base/base_export.h"
#include "base/string16.h"
#include "base/string_piece.h"
@@ -18,23 +18,25 @@
// do the best it can and put the result in the output buffer. The versions that
// return strings ignore this error and just return the best conversion
// possible.
-BASE_API bool WideToUTF8(const wchar_t* src, size_t src_len,
- std::string* output);
-BASE_API std::string WideToUTF8(const std::wstring& wide);
-BASE_API bool UTF8ToWide(const char* src, size_t src_len, std::wstring* output);
-BASE_API std::wstring UTF8ToWide(const base::StringPiece& utf8);
+BASE_EXPORT bool WideToUTF8(const wchar_t* src, size_t src_len,
+ std::string* output);
+BASE_EXPORT std::string WideToUTF8(const std::wstring& wide);
+BASE_EXPORT bool UTF8ToWide(const char* src, size_t src_len,
+ std::wstring* output);
+BASE_EXPORT std::wstring UTF8ToWide(const base::StringPiece& utf8);
-BASE_API bool WideToUTF16(const wchar_t* src, size_t src_len, string16* output);
-BASE_API string16 WideToUTF16(const std::wstring& wide);
-BASE_API bool UTF16ToWide(const char16* src, size_t src_len,
- std::wstring* output);
-BASE_API std::wstring UTF16ToWide(const string16& utf16);
+BASE_EXPORT bool WideToUTF16(const wchar_t* src, size_t src_len,
+ string16* output);
+BASE_EXPORT string16 WideToUTF16(const std::wstring& wide);
+BASE_EXPORT bool UTF16ToWide(const char16* src, size_t src_len,
+ std::wstring* output);
+BASE_EXPORT std::wstring UTF16ToWide(const string16& utf16);
-BASE_API bool UTF8ToUTF16(const char* src, size_t src_len, string16* output);
-BASE_API string16 UTF8ToUTF16(const base::StringPiece& utf8);
-BASE_API bool UTF16ToUTF8(const char16* src, size_t src_len,
- std::string* output);
-BASE_API std::string UTF16ToUTF8(const string16& utf16);
+BASE_EXPORT bool UTF8ToUTF16(const char* src, size_t src_len, string16* output);
+BASE_EXPORT string16 UTF8ToUTF16(const base::StringPiece& utf8);
+BASE_EXPORT bool UTF16ToUTF8(const char16* src, size_t src_len,
+ std::string* output);
+BASE_EXPORT std::string UTF16ToUTF8(const string16& utf16);
// We are trying to get rid of wstring as much as possible, but it's too big
// a mess to do it all at once. These conversions should be used when we
@@ -51,7 +53,7 @@
// These convert an ASCII string, typically a hardcoded constant, to a
// UTF16/Wide string.
-BASE_API std::wstring ASCIIToWide(const base::StringPiece& ascii);
-BASE_API string16 ASCIIToUTF16(const base::StringPiece& ascii);
+BASE_EXPORT std::wstring ASCIIToWide(const base::StringPiece& ascii);
+BASE_EXPORT string16 ASCIIToUTF16(const base::StringPiece& ascii);
#endif // BASE_UTF_STRING_CONVERSIONS_H_
« no previous file with comments | « base/utf_string_conversion_utils.h ('k') | base/value_conversions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698