Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r50960 - in sandbox/SOC/2007/cgi/branches/pickmeup: boost/cgi/detail boost/cgi/utility libs/cgi/build libs/cgi/example/acgi/amortization libs/cgi/example/cgi/DebugServer libs/cgi/example/cgi/DebugServer2
From: lists.drrngrvy_at_[hidden]
Date: 2009-02-01 17:51:22


Author: drrngrvy
Date: 2009-02-01 17:51:20 EST (Sun, 01 Feb 2009)
New Revision: 50960
URL: http://svn.boost.org/trac/boost/changeset/50960

Log:
Fixes for linux.
Added:
   sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer2/Jamfile.v2 (contents, props changed)
Text files modified:
   sandbox/SOC/2007/cgi/branches/pickmeup/boost/cgi/detail/cgi_service_impl_base.hpp | 2 +-
   sandbox/SOC/2007/cgi/branches/pickmeup/boost/cgi/utility/has_key.hpp | 2 +-
   sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/build/Jamfile.v2 | 5 +++--
   sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/acgi/amortization/Jamfile.v2 | 24 +++++++++++++++++++-----
   sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer/Jamfile.v2 | 1 +
   sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer2/TracebackServer.cpp | 2 +-
   6 files changed, 26 insertions(+), 10 deletions(-)

Modified: sandbox/SOC/2007/cgi/branches/pickmeup/boost/cgi/detail/cgi_service_impl_base.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/branches/pickmeup/boost/cgi/detail/cgi_service_impl_base.hpp (original)
+++ sandbox/SOC/2007/cgi/branches/pickmeup/boost/cgi/detail/cgi_service_impl_base.hpp 2009-02-01 17:51:20 EST (Sun, 01 Feb 2009)
@@ -173,7 +173,7 @@
       load(implementation_type& impl, bool parse_stdin
           , boost::system::error_code& ec)
     {
- return load(impl, parse_stdin ? parse_all : (parse_env | parse_cookies), ec);
+ return load(impl, parse_stdin ? common::parse_all : (common::parse_env | common::parse_cookie), ec);
     }/*
       detail::save_environment(env_vars(impl.vars_));
       std::string const& cl = env_vars(impl.vars_)["CONTENT_LENGTH"];

Modified: sandbox/SOC/2007/cgi/branches/pickmeup/boost/cgi/utility/has_key.hpp
==============================================================================
--- sandbox/SOC/2007/cgi/branches/pickmeup/boost/cgi/utility/has_key.hpp (original)
+++ sandbox/SOC/2007/cgi/branches/pickmeup/boost/cgi/utility/has_key.hpp 2009-02-01 17:51:20 EST (Sun, 01 Feb 2009)
@@ -43,7 +43,7 @@
     bool has_key(MapT& data, common::name const& name)
     {
         if (!data.empty())
- for(MapT::const_iterator iter = data.begin(), end = data.end();
+ for(typename MapT::const_iterator iter = data.begin(), end = data.end();
                 iter != end; ++iter)
             {
                 if (iter->first == name)

Modified: sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/build/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/build/Jamfile.v2 (original)
+++ sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/build/Jamfile.v2 2009-02-01 17:51:20 EST (Sun, 01 Feb 2009)
@@ -57,7 +57,7 @@
       <library>/boost/thread/
       <library>/boost/system/
       <library>/boost/regex/
- <library>/boost/date_time/
+ <library>/boost/date_time/
       <define>_CRT_SECURE_NO_WARNINGS
       <define>_SCL_SECURE_NO_WARNINGS
       $(DEFINES)
@@ -67,10 +67,11 @@
       <library>/boost/thread/
       <library>/boost/system/
       <library>/boost/regex/
- <library>/boost/date_time/
+ <library>/boost/date_time/
       <define>_CRT_SECURE_NO_WARNINGS
       <define>_SCL_SECURE_NO_WARNINGS
       <os>unix:<linkflags>-pthread
+ <linkflags>-pthread
       #<tag>@$(__name__).tag
       $(DEFINES)
   ;

Modified: sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/acgi/amortization/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/acgi/amortization/Jamfile.v2 (original)
+++ sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/acgi/amortization/Jamfile.v2 2009-02-01 17:51:20 EST (Sun, 01 Feb 2009)
@@ -30,22 +30,34 @@
   ;
 
 # Our install rule (builds binaries and copies them to <location>)
-install install-app
+install install-exe
  :
    acgi_amort
- acgi_amort.tpl
  :
  :
    <location>$(cgi-bin)
  ;
 
-install install-extra
+install install-css
  :
    acgi_amort.css
+ :
+ <location>$(htdocs)/css/
+ ;
+
+ install install-js
+ :
    acgi_amort.js
  :
+ <location>$(htdocs)/js/
+ ;
+
+install install-extra
+ :
+ acgi_amort.html
+ :
  :
- <location>$(htdocs)
+ <location>$(htdocs)/../templates/
  ;
 
 explicit install-app ;
@@ -53,7 +65,9 @@
 
 install install
   :
- install-app
+ install-exe
+ install-css
+ install-js
     install-extra
   ;
 

Modified: sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer/Jamfile.v2 (original)
+++ sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer/Jamfile.v2 2009-02-01 17:51:20 EST (Sun, 01 Feb 2009)
@@ -14,6 +14,7 @@
     TracingServer.hpp
   :
     <library>/boost/cgi/
+ <library>/boost/chrono/
   ;
 
 

Added: sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer2/Jamfile.v2
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer2/Jamfile.v2 2009-02-01 17:51:20 EST (Sun, 01 Feb 2009)
@@ -0,0 +1,69 @@
+# Copyright (c) 2007 Darren Garvey
+#
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy
+# at http://www.boost.org/LICENSE_1_0.txt)
+
+import os ;
+
+if [ os.name ] = NT
+{
+ # Change this path to where the Google cTemplate library files are.
+ # You'll have to install these yourself.
+ lib ctemplate : : <file>c:/path/to/ctemplate/lib ;
+}
+else
+{
+ lib ctemplate ;
+}
+
+project boost/cgi/example/cgi/debug_server2 ;
+
+exe cgi_debug_server2
+ :
+ ctemplate.cpp
+ TracebackServer.cpp
+ TracebackServer.hpp
+ :
+ <library>/boost/cgi/
+ <library>/boost/chrono/
+ <library>ctemplate
+ ;
+
+
+# Our install rule (builds binaries and copies them to <location>)
+install install-css
+ : debug_view.css
+ : <location>$(htdocs)/css/
+ ;
+
+install install-js
+ : debug_view.js
+ : <location>$(htdocs)/js/
+ ;
+
+install install-template
+ : debug_view.html
+ : <location>$(htdocs)/../templates/
+ ;
+
+install install-exe
+ : cgi_debug_server2
+ : <location>$(cgi-bin)
+ ;
+
+explicit install-css ;
+explicit install-js ;
+explicit install-template ;
+explicit install-exe ;
+
+install install
+ :
+ install-css
+ install-js
+ install-template
+ install-exe
+ ;
+
+# Only install example if you use `bjam install' or equivalent
+explicit install ;

Modified: sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer2/TracebackServer.cpp
==============================================================================
--- sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer2/TracebackServer.cpp (original)
+++ sandbox/SOC/2007/cgi/branches/pickmeup/libs/cgi/example/cgi/DebugServer2/TracebackServer.cpp 2009-02-01 17:51:20 EST (Sun, 01 Feb 2009)
@@ -6,7 +6,7 @@
 namespace detail {
 
 boost::uint64_t
-get_microseconds(boost::chrono::process_clock::duration& tp)
+get_microseconds(boost::chrono::process_clock::duration const& tp)
 {
   return boost::chrono::duration_cast<boost::chrono::microseconds>(tp).count();
 }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk