Reintroduce the old RefCounter from 1.8, which is needed by TagLib::Map<> and TagLib...

diff --git a/taglib/toolkit/tlist.tcc b/taglib/toolkit/tlist.tcc
index 81e2915331cdbfb1b9bf56e5ac49cbc4b255a9e0..72d4767b68b3d5a2d68b57fc333d5f3b822f14da 100644 (file)
--- a/taglib/toolkit/tlist.tcc
+++ b/taglib/toolkit/tlist.tcc
@@ -39,7 +39,8 @@ namespace TagLib {
 // A base for the generic and specialized private class types.  New
 // non-templatized members should be added here.
 
-class ListPrivateBase : public RefCounter
+// BIC change to RefCounter
+class ListPrivateBase : public RefCounterOld
 {
 public:
   ListPrivateBase() : autoDelete(false) {}

diff --git a/taglib/toolkit/tmap.tcc b/taglib/toolkit/tmap.tcc
index d6f51c071cc44262ac3067b89da1a9a0795cda1c..5d3abcad5010b30a7793085fe83a34c9335518dc 100644 (file)
--- a/taglib/toolkit/tmap.tcc
+++ b/taglib/toolkit/tmap.tcc
@@ -31,17 +31,18 @@ namespace TagLib {
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
+// BIC change to RefCounter
 template <class Key, class T>
 template <class KeyP, class TP>
-class Map<Key, T>::MapPrivate : public RefCounter
+class Map<Key, T>::MapPrivate : public RefCounterOld
 {
 public:
-  MapPrivate() : RefCounter() {}
+  MapPrivate() : RefCounterOld() {}
 #ifdef WANT_CLASS_INSTANTIATION_OF_MAP
-  MapPrivate(const std::map<class KeyP, class TP>& m) : RefCounter(), map(m) {}
+  MapPrivate(const std::map<class KeyP, class TP>& m) : RefCounterOld(), map(m) {}
   std::map<class KeyP, class TP> map;
 #else
-  MapPrivate(const std::map<KeyP, TP>& m) : RefCounter(), map(m) {}
+  MapPrivate(const std::map<KeyP, TP>& m) : RefCounterOld(), map(m) {}
   std::map<KeyP, TP> map;
 #endif
 };

diff --git a/taglib/toolkit/trefcounter.h b/taglib/toolkit/trefcounter.h
index 53c6f1c0572105f272e566d7628cafbac89c9d20..75388b1012b0543ec10a68998f6a86e1eb8ad502 100644 (file)
--- a/taglib/toolkit/trefcounter.h
+++ b/taglib/toolkit/trefcounter.h
@@ -29,6 +29,23 @@
 #include "taglib_export.h"
 #include "taglib.h"
 
+#ifdef __APPLE__
+#  include <libkern/OSAtomic.h>
+#  define TAGLIB_ATOMIC_MAC
+#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#  define NOMINMAX
+#  include <windows.h>
+#  define TAGLIB_ATOMIC_WIN
+#elif defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)    \
+      && (defined(__i386__) || defined(__i486__) || defined(__i586__) || \
+          defined(__i686__) || defined(__x86_64) || defined(__ia64)) \
+      && !defined(__INTEL_COMPILER)
+#  define TAGLIB_ATOMIC_GCC
+#elif defined(__ia64) && defined(__INTEL_COMPILER)
+#  include <ia64intrin.h>
+#  define TAGLIB_ATOMIC_GCC
+#endif
+
 #ifndef DO_NOT_DOCUMENT // Tell Doxygen to skip this class.
 /*!
   * \internal
@@ -38,6 +55,7 @@
   */
 namespace TagLib
 {
+
   class TAGLIB_EXPORT RefCounter
   {
   public:
@@ -52,7 +70,42 @@ namespace TagLib
     class RefCounterPrivate;
     RefCounterPrivate *d;
   };
+
+  // BIC this old class is needed by tlist.tcc and tmap.tcc
+  class RefCounterOld
+  {
+  public:
+    RefCounterOld() : refCount(1) {}
+
+#ifdef TAGLIB_ATOMIC_MAC
+    void ref() { OSAtomicIncrement32Barrier(const_cast<int32_t*>(&refCount)); }
+    bool deref() { return ! OSAtomicDecrement32Barrier(const_cast<int32_t*>(&refCount)); }
+    int32_t count() { return refCount; }
+  private:
+    volatile int32_t refCount;
+#elif defined(TAGLIB_ATOMIC_WIN)
+    void ref() { InterlockedIncrement(&refCount); }
+    bool deref() { return ! InterlockedDecrement(&refCount); }
+    long count() { return refCount; }
+  private:
+    volatile long refCount;
+#elif defined(TAGLIB_ATOMIC_GCC)
+    void ref() { __sync_add_and_fetch(&refCount, 1); }
+    bool deref() { return ! __sync_sub_and_fetch(&refCount, 1); }
+    int count() { return refCount; }
+  private:
+    volatile int refCount;
+#else
+    void ref() { refCount++; }
+    bool deref() { return ! --refCount; }
+    int count() { return refCount; }
+  private:
+    uint refCount;
+#endif
+  };
+
 }
 
 #endif // DO_NOT_DOCUMENT
 #endif
+