From: lists.drrngrvy_at_[hidden]
Date: 2007-08-25 21:11:21
Author: drrngrvy
Date: 2007-08-25 21:11:20 EDT (Sat, 25 Aug 2007)
New Revision: 38958
URL: http://svn.boost.org/trac/boost/changeset/38958
Log:
Added fixes to make it compile on MSVC7.1 (should work now)
Text files modified:
sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service.hpp | 12 +++++-------
sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service_fwd.hpp | 3 +--
sandbox/SOC/2007/cgi/boost/cgi/detail/save_environment.hpp | 3 ++-
sandbox/SOC/2007/cgi/boost/cgi/detail/service_base.hpp | 2 +-
sandbox/SOC/2007/cgi/boost/cgi/io_service_provider.hpp | 6 +++---
5 files changed, 12 insertions(+), 14 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-25 21:11:20 EDT (Sat, 25 Aug 2007)
@@ -12,10 +12,9 @@
#include <set>
#include <queue>
#include <boost/shared_ptr.hpp>
-#include <boost/asio/io_service.hpp>
#include <boost/asio/strand.hpp>
-#include "boost/cgi/tags.hpp"
+#include "boost/cgi/io_service.hpp"
#include "boost/cgi/io_service_provider.hpp"
#include "boost/cgi/basic_request_fwd.hpp"
#include "boost/cgi/detail/protocol_traits.hpp"
@@ -106,23 +105,23 @@
* The order in which the underlying io_services are returned is determined
* by what policy the IoServiceProvider uses.
*/
- boost::asio::io_service& io_service()
+ ::cgi::io_service& io_service()
{
- return ios_provider_.io_service();
+ return ios_provider_.get_io_service();
}
/// Post the handler through an available io_service
template<typename Handler>
void post(Handler handler)
{
- ios_provider_.io_service().post(handler);
+ ios_provider_.get_io_service().post(handler);
}
/// Dispatch a handler through an available io_service
template<typename Handler>
void dispatch(Handler handler)
{
- ios_provider_.io_service().dispatch(handler);
+ ios_provider_.get_io_service().dispatch(handler);
}
private:
@@ -131,7 +130,6 @@
/// A strand is used for guaranteeing handlers are dispatched sequentially
//boost::asio::strand strand_;
-
set_type request_set_;
queue_type request_queue_;
Modified: sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service_fwd.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service_fwd.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/basic_protocol_service_fwd.hpp 2007-08-25 21:11:20 EDT (Sat, 25 Aug 2007)
@@ -9,8 +9,7 @@
#ifndef CGI_BASIC_PROTOCOL_SERVICE_FWD_HPP_INCLUDED__
#define CGI_BASIC_PROTOCOL_SERVICE_FWD_HPP_INCLUDED__
-#include "boost/cgi/tags.hpp"
-#include "boost/cgi/io_service_provider_fwd.hpp"
+#include "boost/cgi/io_service_provider.hpp"
namespace cgi {
Modified: sandbox/SOC/2007/cgi/boost/cgi/detail/save_environment.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/detail/save_environment.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/detail/save_environment.hpp 2007-08-25 21:11:20 EDT (Sat, 25 Aug 2007)
@@ -15,6 +15,7 @@
#include "boost/cgi/map.hpp"
// The process' environment
+// MSVC8 could do with this having a _CRTIMP at the start of it.
extern char** environ;
namespace cgi {
@@ -26,7 +27,7 @@
* environment.
*/
void save_environment(std::map<std::string,std::string>& env_map
- , char** env = ::environ)
+ , char** env = environ)
{
for(; *env; ++env)
{
Modified: sandbox/SOC/2007/cgi/boost/cgi/detail/service_base.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/detail/service_base.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/detail/service_base.hpp 2007-08-25 21:11:20 EDT (Sat, 25 Aug 2007)
@@ -15,7 +15,7 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/io_service.hpp>
-#include "boost/cgi/service_id.hpp"
+#include "boost/cgi/detail/service_id.hpp"
namespace cgi {
namespace detail {
Modified: sandbox/SOC/2007/cgi/boost/cgi/io_service_provider.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/boost/cgi/io_service_provider.hpp (original)
+++ sandbox/SOC/2007/cgi/boost/cgi/io_service_provider.hpp 2007-08-25 21:11:20 EDT (Sat, 25 Aug 2007)
@@ -16,9 +16,9 @@
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
-#include "boost/cgi/tags.hpp"
#include "boost/cgi/io_service.hpp"
#include "boost/cgi/detail/push_options.hpp"
+#include "boost/cgi/io_service_provider_fwd.hpp"
namespace cgi {
@@ -53,7 +53,7 @@
{
}
- ::cgi::io_service& io_service()
+ cgi::io_service& get_io_service()
{
return io_service_;
}
@@ -73,7 +73,7 @@
io_service_.reset();
}
private:
- ::cgi::io_service io_service_;
+ cgi::io_service io_service_;
};