Remove all the optional dependencies on Boost.

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 98751b0691df4219c1913590d19785648f361e17..f69b4380af7b4f901a3900e6a4daa233ec91d0ca 100644 (file)
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -103,69 +103,57 @@ endif()
 # Determine which kind of byte swap functions your compiler supports.
 
 check_cxx_source_compiles("
-  #include <boost/endian/conversion.hpp>
   int main() {
-    boost::endian::endian_reverse(static_cast<uint16_t>(1));
-    boost::endian::endian_reverse(static_cast<uint32_t>(1));
-    boost::endian::endian_reverse(static_cast<uint64_t>(1));
+    __builtin_bswap16(0);
+    __builtin_bswap32(0);
+    __builtin_bswap64(0);
     return 0;
   }
-" HAVE_BOOST_BYTESWAP)
+" HAVE_GCC_BYTESWAP)
 
-if(NOT HAVE_BOOST_BYTESWAP)
+if(NOT HAVE_GCC_BYTESWAP)
   check_cxx_source_compiles("
+    #include <byteswap.h>
     int main() {
-      __builtin_bswap16(0);
-      __builtin_bswap32(0);
-      __builtin_bswap64(0);
+      __bswap_16(0);
+      __bswap_32(0);
+      __bswap_64(0);
       return 0;
     }
-  " HAVE_GCC_BYTESWAP)
+  " HAVE_GLIBC_BYTESWAP)
 
-  if(NOT HAVE_GCC_BYTESWAP)
+  if(NOT HAVE_GLIBC_BYTESWAP)
     check_cxx_source_compiles("
-      #include <byteswap.h>
+      #include <stdlib.h>
       int main() {
-        __bswap_16(0);
-        __bswap_32(0);
-        __bswap_64(0);
+        _byteswap_ushort(0);
+        _byteswap_ulong(0);
+        _byteswap_uint64(0);
         return 0;
       }
-    " HAVE_GLIBC_BYTESWAP)
+    " HAVE_MSC_BYTESWAP)
 
-    if(NOT HAVE_GLIBC_BYTESWAP)
+    if(NOT HAVE_MSC_BYTESWAP)
       check_cxx_source_compiles("
-        #include <stdlib.h>
+        #include <libkern/OSByteOrder.h>
         int main() {
-          _byteswap_ushort(0);
-          _byteswap_ulong(0);
-          _byteswap_uint64(0);
+          OSSwapInt16(0);
+          OSSwapInt32(0);
+          OSSwapInt64(0);
           return 0;
         }
-      " HAVE_MSC_BYTESWAP)
+      " HAVE_MAC_BYTESWAP)
 
-      if(NOT HAVE_MSC_BYTESWAP)
+      if(NOT HAVE_MAC_BYTESWAP)
         check_cxx_source_compiles("
-          #include <libkern/OSByteOrder.h>
+          #include <sys/endian.h>
           int main() {
-            OSSwapInt16(0);
-            OSSwapInt32(0);
-            OSSwapInt64(0);
+            swap16(0);
+            swap32(0);
+            swap64(0);
             return 0;
           }
-        " HAVE_MAC_BYTESWAP)
-
-        if(NOT HAVE_MAC_BYTESWAP)
-          check_cxx_source_compiles("
-            #include <sys/endian.h>
-            int main() {
-              swap16(0);
-              swap32(0);
-              swap64(0);
-              return 0;
-            }
-          " HAVE_OPENBSD_BYTESWAP)
-        endif()
+        " HAVE_OPENBSD_BYTESWAP)
       endif()
     endif()
   endif()

diff --git a/config.h.cmake b/config.h.cmake
index fd71613425f712f8baa16e473bf491df4dca08cf..c1a31094834a3204eb19318826293f469c523d04 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -4,7 +4,6 @@
 #define TAGLIB_CONFIG_H
 
 /* Defined if your compiler supports some byte swap functions */
-#cmakedefine   HAVE_BOOST_BYTESWAP 1
 #cmakedefine   HAVE_GCC_BYTESWAP 1
 #cmakedefine   HAVE_GLIBC_BYTESWAP 1
 #cmakedefine   HAVE_MSC_BYTESWAP 1

diff --git a/taglib/toolkit/tutils.h b/taglib/toolkit/tutils.h
index b114619e0f5f912f8afe33d9bb015ed7e9cc9309..6d96cd12ddff4c665a8f63006657c8ee15ed79d4 100644 (file)
--- a/taglib/toolkit/tutils.h
+++ b/taglib/toolkit/tutils.h
@@ -34,9 +34,7 @@
 # include <config.h>
 #endif
 
-#if defined(HAVE_BOOST_BYTESWAP)
-# include <boost/endian/conversion.hpp>
-#elif defined(HAVE_MSC_BYTESWAP)
+#if defined(HAVE_MSC_BYTESWAP)
 # include <stdlib.h>
 #elif defined(HAVE_GLIBC_BYTESWAP)
 # include <byteswap.h>
@@ -63,11 +61,7 @@ namespace TagLib
        */
       inline unsigned short byteSwap(unsigned short x)
       {
-#if defined(HAVE_BOOST_BYTESWAP)
-
-        return boost::endian::endian_reverse(static_cast<uint16_t>(x));
-
-#elif defined(HAVE_GCC_BYTESWAP)
+#if defined(HAVE_GCC_BYTESWAP)
 
         return __builtin_bswap16(x);
 
@@ -99,11 +93,7 @@ namespace TagLib
        */
       inline unsigned int byteSwap(unsigned int x)
       {
-#if defined(HAVE_BOOST_BYTESWAP)
-
-        return boost::endian::endian_reverse(static_cast<uint32_t>(x));
-
-#elif defined(HAVE_GCC_BYTESWAP)
+#if defined(HAVE_GCC_BYTESWAP)
 
         return __builtin_bswap32(x);
 
@@ -138,11 +128,7 @@ namespace TagLib
        */
       inline unsigned long long byteSwap(unsigned long long x)
       {
-#if defined(HAVE_BOOST_BYTESWAP)
-
-        return boost::endian::endian_reverse(static_cast<uint64_t>(x));
-
-#elif defined(HAVE_GCC_BYTESWAP)
+#if defined(HAVE_GCC_BYTESWAP)
 
         return __builtin_bswap64(x);