[Boost-commit] svn:boost r59402 - in sandbox/SOC/2007/cgi/trunk: . boost/cgi/connections boost/cgi/fcgi libs/cgi/example/fcgi/amortization

Subject: [Boost-commit] svn:boost r59402 - in sandbox/SOC/2007/cgi/trunk: . boost/cgi/connections boost/cgi/fcgi libs/cgi/example/fcgi/amortization
From: lists.drrngrvy_at_[hidden]
Date: 2010-01-31 19:37:36

Author: drrngrvy
Date: 2010-01-31 19:37:35 EST (Sun, 31 Jan 2010)
New Revision: 59402
URL: http://svn.boost.org/trac/boost/changeset/59402

Log:
Re-merging pickmeup.
Properties modified: 
   sandbox/SOC/2007/cgi/trunk/   (props changed)
   sandbox/SOC/2007/cgi/trunk/libs/cgi/example/fcgi/amortization/amortization.css   (props changed)
   sandbox/SOC/2007/cgi/trunk/libs/cgi/example/fcgi/amortization/amortization.js   (props changed)
Text files modified: 
   sandbox/SOC/2007/cgi/trunk/boost/cgi/connections/stdio.hpp |     1 +                                       
   sandbox/SOC/2007/cgi/trunk/boost/cgi/fcgi/client.hpp       |     6 +++---                                  
   2 files changed, 4 insertions(+), 3 deletions(-)

Modified: sandbox/SOC/2007/cgi/trunk/boost/cgi/connections/stdio.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/trunk/boost/cgi/connections/stdio.hpp	(original)
+++ sandbox/SOC/2007/cgi/trunk/boost/cgi/connections/stdio.hpp	2010-01-31 19:37:35 EST (Sun, 31 Jan 2010)
@@ -11,6 +11,7 @@
 
 #include <cstdio>
 #include <string>
+#include <boost/config.hpp>
 #if BOOST_WINDOWS
 #   include <stdio.h> // for _setmode
 #   include <io.h>    // for _setmode

Modified: sandbox/SOC/2007/cgi/trunk/boost/cgi/fcgi/client.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/trunk/boost/cgi/fcgi/client.hpp	(original)
+++ sandbox/SOC/2007/cgi/trunk/boost/cgi/fcgi/client.hpp	2010-01-31 19:37:35 EST (Sun, 31 Jan 2010)
@@ -178,7 +178,7 @@
     
     std::size_t total_buffer_size = static_cast<std::size_t>(header_.content_length());
     
-#ifndef NDEBUG
+#if !defined(BOOST_CGI_NO_LOGGING) && !defined(NDEBUG)
     if (ec)
       std::cerr<< "Error " << ec << ": " << ec.message() << '\n';
     else    
@@ -188,10 +188,10 @@
         << " protocol) bytes (running total: "
         << total_sent_bytes_ << " bytes; "
         << total_sent_packets_ << " packets).\n";
-#endif // NDEBUG
+#endif // !defined(BOOST_CGI_NO_LOGGING) && !defined(NDEBUG)
 
     // Now remove the protocol overhead for the caller, who
-    // doesn't want to know about them.
+    // doesn't want to count it.
     bytes_transferred -= fcgi::spec::header_length::value;
     // Check everything was written ok.
     if (!ec && bytes_transferred != total_buffer_size)