[libsigc++2] Fix build with MSVC



commit e0a95276edc2c719c0e11260899066c685d7bfb6
Author: Armin Burgmeier <armin arbur net>
Date:   Mon Oct 26 18:21:05 2009 +0100

    Fix build with MSVC
    
    2009-10-26  Armin Burgmeier  <armin arbur net>
    
    	* sigc++config.h: Move the first five definitions to the !SIGC_MSC
    	ifdef block, so MSVC does not see them and only uses the definitions
    	from the SIGC_MSC block. This fixes the build with MSVC.

 ChangeLog         |    6 ++++++
 sigc++config.h.in |   40 +++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7c307dd..5885f67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-26  Armin Burgmeier  <armin arbur net>
+
+	* sigc++config.h: Move the first five definitions to the !SIGC_MSC
+	ifdef block, so MSVC does not see them and only uses the definitions
+	from the SIGC_MSC block. This fixes the build with MSVC.
+
 2009-09-19  Daniel Elstner  <daniel kitta gmail com>
 
 	Support Automake silent rules
diff --git a/sigc++config.h.in b/sigc++config.h.in
index 2e05e15..05e4840 100644
--- a/sigc++config.h.in
+++ b/sigc++config.h.in
@@ -1,22 +1,4 @@
 
-/* does the C++ compiler support the use of a particular specialization when
-   calling operator() template methods. */
-#undef SIGC_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD
-
-/* Defined when the libstdc++ declares the std-namespace */
-#undef SIGC_HAVE_NAMESPACE_STD
-
-/* Define if the non-standard Sun reverse_iterator must be used. */
-#undef SIGC_HAVE_SUN_REVERSE_ITERATOR
-
-/* does the C++ compiler support the use of a particular specialization when
-   calling operator() template methods omitting the template keyword. */
-#undef SIGC_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD
-
-/* does c++ compiler allows usage of member function in initialization of
-   static member field. */
-#undef SIGC_SELF_REFERENCE_IN_MEMBER_INITIALIZATION
-
 /* Major version number of sigc++. */
 #undef SIGCXX_MAJOR_VERSION
 
@@ -63,7 +45,27 @@
 # define SIGC_NEW_DELETE_IN_LIBRARY_ONLY 1 /* To keep ABI compatibility */
 # define SIGC_HAVE_NAMESPACE_STD 1
 
-#endif /* SIGC_MSC */
+#else /* SIGC_MSC */
+
+/* does the C++ compiler support the use of a particular specialization when
+   calling operator() template methods. */
+# undef SIGC_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD
+
+/* Defined when the libstdc++ declares the std-namespace */
+# undef SIGC_HAVE_NAMESPACE_STD
+
+/* Define if the non-standard Sun reverse_iterator must be used. */
+# undef SIGC_HAVE_SUN_REVERSE_ITERATOR
+
+/* does the C++ compiler support the use of a particular specialization when
+   calling operator() template methods omitting the template keyword. */
+# undef SIGC_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD
+
+/* does c++ compiler allows usage of member function in initialization of
+   static member field. */
+# undef SIGC_SELF_REFERENCE_IN_MEMBER_INITIALIZATION
+
+#endif /* !SIGC_MSC */
 
 #ifdef SIGC_HAVE_NAMESPACE_STD
 # define SIGC_USING_STD(Symbol) /* empty */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]