[Boost-commit] svn:boost r85761 - trunk/boost/asio/detail

Subject: [Boost-commit] svn:boost r85761 - trunk/boost/asio/detail
From: chris_at_[hidden]
Date: 2013-09-17 18:08:43

Author: chris_kohlhoff
Date: 2013-09-17 18:08:43 EDT (Tue, 17 Sep 2013)
New Revision: 85761
URL: http://svn.boost.org/trac/boost/changeset/85761

Log:
Visual C++ language extensions use generic as a keyword. Add a
workaround that renames the namespace to cpp_generic when those
language extensions are in effect.

Text files modified: 
   trunk/boost/asio/detail/pop_options.hpp  |     7 +++++++                                 
   trunk/boost/asio/detail/push_options.hpp |     9 +++++++++                               
   2 files changed, 16 insertions(+), 0 deletions(-)

Modified: trunk/boost/asio/detail/pop_options.hpp
==============================================================================
--- trunk/boost/asio/detail/pop_options.hpp	Tue Sep 17 18:08:07 2013	(r85760)
+++ trunk/boost/asio/detail/pop_options.hpp	2013-09-17 18:08:43 EDT (Tue, 17 Sep 2013)	(r85761)
@@ -95,4 +95,11 @@
 # pragma warning (pop)
 # pragma pack (pop)
 
+# if defined(__cplusplus_cli) || defined(__cplusplus_winrt)
+#  if defined(BOOST_ASIO_CLR_WORKAROUND)
+#   undef generic
+#   undef BOOST_ASIO_CLR_WORKAROUND
+#  endif
+# endif
+
 #endif

Modified: trunk/boost/asio/detail/push_options.hpp
==============================================================================
--- trunk/boost/asio/detail/push_options.hpp	Tue Sep 17 18:08:07 2013	(r85760)
+++ trunk/boost/asio/detail/push_options.hpp	2013-09-17 18:08:43 EDT (Tue, 17 Sep 2013)	(r85761)
@@ -124,4 +124,13 @@
 #  error Multithreaded RTL must be selected.
 # endif // !defined(_MT)
 
+# if defined(__cplusplus_cli) || defined(__cplusplus_winrt)
+#  if !defined(BOOST_ASIO_DISABLE_CLR_WORKAROUND)
+#   if !defined(generic)
+#    define generic cpp_generic
+#    define BOOST_ASIO_CLR_WORKAROUND
+#   endif
+#  endif
+# endif
+
 #endif