[Boost-commit] svn:boost r39011 - in sandbox/SOC/2007/cgi/boost/cgi: . detail

From: lists.drrngrvy_at_[hidden]
Date: 2007-08-27 14:08:58

Author: drrngrvy
Date: 2007-08-27 14:08:57 EDT (Mon, 27 Aug 2007)
New Revision: 39011
URL: http://svn.boost.org/trac/boost/changeset/39011

Log:
Added crude hack to basic_protocol_request.hpp to deal with MSVC and GCC differences w.r.t. friends and typedefs of nested, templated classes. This might still be non-std C++, but it seems to work. Also, remove some warnings on MSVC
Text files modified: 
   sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp |     6 ++++++                                  
   sandbox/SOC/2007/cgi/boost/cgi/detail/pop_options.hpp     |     4 ++--                                    
   sandbox/SOC/2007/cgi/boost/cgi/detail/push_options.hpp    |     8 ++++----                                
   3 files changed, 12 insertions(+), 6 deletions(-)

Modified: sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp	(original)
+++ sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp	2007-08-27 14:08:57 EDT (Mon, 27 Aug 2007)
@@ -13,6 +13,7 @@
 #include <queue>
 #include <boost/shared_ptr.hpp>
 #include <boost/asio/strand.hpp>
+#include <boost/detail/workaround.hpp>
 
 #include "boost/cgi/io_service.hpp"
 #include "boost/cgi/io_service_provider.hpp"
@@ -137,7 +138,12 @@
 
     //friend class basic_gateway<protocol_type>;//gateway_type;
     //friend class basic_acceptor<protocol_type>;//class acceptor_type;
+#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400))
     friend typename traits::request_type;//typename request_type;
+#else
+    friend class traits::request_type;
+#endif
+    //friend class request_type;
   };
 
 } // namespace cgi

Modified: sandbox/SOC/2007/cgi/boost/cgi/detail/pop_options.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/detail/pop_options.hpp	(original)
+++ sandbox/SOC/2007/cgi/boost/cgi/detail/pop_options.hpp	2007-08-27 14:08:57 EDT (Mon, 27 Aug 2007)
@@ -7,9 +7,9 @@
 //
 ////////////////////////////////////////////////////////////////
 
-#ifdef _MSC_VER
+//#ifdef _MSC_VER
 
 //#pragma warning (disable:)
 //#undef _CRT_SECURE_NO_DEPRECATE
 
-#endif
+//#endif

Modified: sandbox/SOC/2007/cgi/boost/cgi/detail/push_options.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/detail/push_options.hpp	(original)
+++ sandbox/SOC/2007/cgi/boost/cgi/detail/push_options.hpp	2007-08-27 14:08:57 EDT (Mon, 27 Aug 2007)
@@ -7,10 +7,10 @@
 //
 ////////////////////////////////////////////////////////////////
 
-#ifdef _MSC_VER
+//#ifdef _MSC_VER
 
 //#pragma warning (disable:)
-#define _CRT_SECURE_NO_DEPRECATE 1
-#pragma warning (disable:4996)
+//#define _CRT_SECURE_NO_DEPRECATE 1
+//#pragma warning (disable:4996)
 
-#endif
+//#endif