[ZooLib-checkins] SF.net SVN: zoolib:[2619] trunk/zoolib/source/cxx/zoolib/zconfigl.h

[<ag...@us...>]

Revision: 2619
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2619&view=rev
Author:   agreen
Date:     2011-11-25 20:37:47 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Accomodate VC2010.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/zoolib/zconfigl.h

Modified: trunk/zoolib/source/cxx/zoolib/zconfigl.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/zconfigl.h	2011-11-18 20:14:31 UTC (rev 2618)
+++ trunk/zoolib/source/cxx/zoolib/zconfigl.h	2011-11-25 20:37:47 UTC (rev 2619)
@@ -269,24 +269,26 @@
 // Objective C we're switching to use the soon-to-be standardized nullptr.
 
 #ifdef __cplusplus
-	#ifndef __MWERKS__
-		const class nullptr_t
+	#ifdef __MWERKS__
+		class nullptr_t
 			{
 		public:
 			template <class T> operator T*() const { return 0; }
-			template <class C, class T> operator T C::*() const { return 0; }
 		private:
 			void operator&() const;
-			} nullptr = {};
+			};
+		#define nullptr nullptr_t()
+	#elif _MSC_VER >= 1600
+		// nullptr is naturally available
 	#else
-		class nullptr_t
+		const class nullptr_t
 			{
 		public:
 			template <class T> operator T*() const { return 0; }
+			template <class C, class T> operator T C::*() const { return 0; }
 		private:
 			void operator&() const;
-			};
-		#define nullptr nullptr_t()
+			} nullptr = {};
 	#endif
 #else
 	#ifndef nullptr

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.