diff options
| author | Tsuda Kageyu <tsuda.kageyu@gmail.com> | 2013-05-03 18:26:43 +0900 |
|---|---|---|
| committer | Tsuda Kageyu <tsuda.kageyu@gmail.com> | 2013-05-03 18:28:28 +0900 |
| commit | 03adafbfd9e9c157fc71a024abd1f3f2fa667f1c (patch) | |
| tree | 17fd3d70bbb8c084974ebd714d5df8d93835bdb3 | |
| parent | 198530547d758404cca814b89583ad1b3e695f45 (diff) | |
Removed TAGLIB_HAVE_STD_WSTRING macro that affects the public ABI
| -rw-r--r-- | ConfigureChecks.cmake | 10 | ||||
| -rw-r--r-- | taglib/taglib_config.h.cmake | 3 | ||||
| -rwxr-xr-x | taglib/toolkit/taglib.h | 4 | ||||
| -rw-r--r-- | taglib/toolkit/trefcounter.cpp | 2 | ||||
| -rw-r--r-- | taglib/toolkit/trefcounter.h | 2 |
5 files changed, 2 insertions, 19 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index b2dcd9b5..025c9d80 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -39,16 +39,6 @@ else() set(SYSTEM_BYTEORDER 2) endif() -# Determine if your compiler supports std::wstring. - -check_cxx_source_compiles(" - #include <string> - int main() { - std::wstring x(L\"ABC\"); - return 0; - } -" TAGLIB_HAVE_STD_WSTRING) - # Determine which kind of atomic operations your compiler supports. check_cxx_source_compiles(" diff --git a/taglib/taglib_config.h.cmake b/taglib/taglib_config.h.cmake index 2eb67b06..1560c247 100644 --- a/taglib/taglib_config.h.cmake +++ b/taglib/taglib_config.h.cmake @@ -1,8 +1,5 @@ /* taglib_config.h. Generated by cmake from taglib_config.h.cmake */ -/* Defined if your compiler supports std::wstring */ -#cmakedefine TAGLIB_HAVE_STD_WSTRING 1 - #define TAGLIB_WITH_ASF 1 #define TAGLIB_WITH_MP4 1 diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h index 80233db3..f93f280d 100755 --- a/taglib/toolkit/taglib.h +++ b/taglib/toolkit/taglib.h @@ -73,11 +73,7 @@ namespace TagLib { * Unfortunately std::wstring isn't defined on some systems, (i.e. GCC < 3) * so I'm providing something here that should be constant. */ -#ifdef TAGLIB_HAVE_STD_WSTRING - typedef std::wstring wstring; -#else typedef std::basic_string<wchar> wstring; -#endif } /*! diff --git a/taglib/toolkit/trefcounter.cpp b/taglib/toolkit/trefcounter.cpp index b971c93c..327d7245 100644 --- a/taglib/toolkit/trefcounter.cpp +++ b/taglib/toolkit/trefcounter.cpp @@ -102,4 +102,4 @@ namespace TagLib { return d->count(); } -}
\ No newline at end of file +} diff --git a/taglib/toolkit/trefcounter.h b/taglib/toolkit/trefcounter.h index 7559e695..2d4ea7c8 100644 --- a/taglib/toolkit/trefcounter.h +++ b/taglib/toolkit/trefcounter.h @@ -54,4 +54,4 @@ namespace TagLib } #endif // DO_NOT_DOCUMENT -#endif
\ No newline at end of file +#endif |