1. dimajix
  2. Untitled project
  3. Magnum

Commits

Kaya Kupferschmidt  committed 19e1a4c

Fixed some build issues in VS 9

  • Participants
  • Parent commits f07e93b
  • Branches default

Comments (0)

Files changed (2)

File source/libs/magnum_core/source/magnum/object/Function.h

View file
         : super(functor) { } \
     template<class F> inline Function(F* functor) \
         : super(functor) { } \
-    template<class O, class F> inline Function(O* obj, const F& functor) \
+    template<class O, class F> inline Function(O* obj, F functor) \
         : super(obj, functor) { }
 
 #define MG_FUNCTION_OPERATORS \

File source/libs/magnum_core/source/magnum/object/platform/intrinsics.h

View file
 	#define InterlockedDecrement _InterlockedDecrement
 
 	#if _MSC_VER >= 1400
-    #   pragma intrinsic (_InterlockedAdd)
     #   pragma intrinsic (_InterlockedIncrement16)
 	#   pragma intrinsic (_InterlockedDecrement16)
 	#endif
 
 	#if defined(_M_IA64) || defined(_M_X64)
-    #   pragma intrinsic (_InterlockedAdd64)
     #   pragma intrinsic (_InterlockedIncrement64)
 	#   pragma intrinsic (_InterlockedDecrement64)
 	#endif