Removed TAGLIB_HAVE_STD_WSTRING macro that affects the public ABI

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index b2dcd9b5132798b7bbe67e4324804cfe7f267c4b..025c9d8006e971c917ca53314c9b2e323682c08b 100644 (file)
--- 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 2eb67b06d1cd24c30d4f847b939986d36b3085e3..1560c247867f92b2523a3e6c6eb671cfa763a8a5 100644 (file)
--- 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 80233db3adcb9f639aa9258421d997d3c0bf3c45..f93f280d69fb8bc3d5009b26b2acd4277844eeba 100755 (executable)
--- 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 b971c93c8cbc17e609135fec8afb683ff9e2b62d..327d72454881fde937d6fd71c0ea51e11c2c05ae 100644 (file)
--- 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 7559e69536cef4357736cd453402a3cfb0735dcd..2d4ea7c857f5c21421536cf9e97cde26be251ea9 100644 (file)
--- 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