Fixed compilation errors for gcc@linux (not all yet).

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@181 0fc631ac-6414-0410-93d0-97cfa31319b6

src/util/atomic.hpp

@@ -0,0 +1,88 @@
+//+----------------------------------------------------------------------------+
+//| Description:  Magic Set Editor - Program to make Magic (tm) cards          |
+//| Copyright:    (C) 2001 - 2006 Twan van Laarhoven                           |
+//| License:      GNU General Public License 2 or later (see file COPYING)     |
+//+----------------------------------------------------------------------------+
+
+#ifndef HEADER_UTIL_ATOMIC
+#define HEADER_UTIL_ATOMIC
+
+/** @file util/atomic.hpp
+ *
+ *  @brief Provides the type AtomicInt, which is an integer that can be incremented and decremented atomicly
+ */
+
+// ----------------------------------------------------------------------------- : Includes
+
+// ----------------------------------------------------------------------------- : AtomicInt : windows
+
+#ifdef _WX_MSW_
+	
+	#ifdef _MSC_VER
+		extern "C" {
+			LONG  __cdecl _InterlockedIncrement(LONG volatile *Addend);
+			LONG  __cdecl _InterlockedDecrement(LONG volatile *Addend);
+		}
+		#pragma intrinsic (_InterlockedIncrement)
+		#define InterlockedIncrement _InterlockedIncrement
+		#pragma intrinsic (_InterlockedDecrement)
+		#define InterlockedDecrement _InterlockedDecrement
+	#endif
+		
+	/// An integer which is equivalent to an AtomicInt, but which doesn't support attomic operations
+	typedef LONG AtomicIntEquiv;
+	
+	/// An integer that can be incremented and decremented atomicly
+	class AtomicInt {
+	  public:
+		AtomicInt(AtomicIntEquiv v) : v(v) {}
+		inline operator AtomicIntEquiv() const {
+			return v;
+		}
+		/// Attomicly increments this AtomicInt, returns the new value
+		inline AtomicIntEquiv operator ++ () {
+			return InterlockedIncrement(&v);
+		}
+		/// Attomicly decrements this AtomicInt, returns the new value
+		inline AtomicIntEquiv operator -- () {
+			return InterlockedDecrement(&v);
+		}
+	  private:
+		AtomicIntEquiv    v;  ///< The value
+	};
+
+	/// We have a fast AtomicInt
+	#define HAVE_FAST_ATOMIC
+	
+// ----------------------------------------------------------------------------- : AtomicInt : portable
+#else
+	
+	/// An integer which is equivalent to an AtomicInt, but which doesn't support attomic operations
+	typedef long AtomicIntEquiv;
+	
+	/// An integer that can be incremented and decremented atomicly
+	class AtomicInt {
+	  public:
+		AtomicInt(AtomicIntEquiv v) : v(v) {}
+		inline operator AtomicIntEquiv() const {
+			return v;
+		}
+		/// Attomicly increments this AtomicInt, returns the new value
+		inline AtomicIntEquiv operator ++ () {
+			wxCriticalSectionLocker lock(cs);
+			return ++v;
+		}
+		/// Attomicly decrements this AtomicInt, returns the new value
+		inline AtomicIntEquiv operator -- () {
+			wxCriticalSectionLocker lock(cs);
+			return --v;
+		}
+	  private:
+		AtomicIntEquiv    v;  ///< The value
+		wxCriticalSection cs; ///< Critical section protecting v
+	};
+	
+#endif
+
+// ----------------------------------------------------------------------------- : EOF
+#endif