From 676eb029b8d58018670b9bfc4be5ef2969eca4b0 Mon Sep 17 00:00:00 2001
From: Roland Schwarz <roland.schwarz@blackspace.at>
Date: Sun, 24 Sep 2006 13:08:22 +0000
Subject: [PATCH] Examples compile with bbv1

[SVN r35308]
---
 example/Jamfile             | 48 +++++++++++++++++++------------------
 example/Jamrules            | 10 ++++----
 example/condition.cpp       | 16 +++++--------
 example/monitor.cpp         | 13 ++++------
 example/mutex.cpp           | 13 ++++------
 example/once.cpp            | 13 ++++------
 example/recursive_mutex.cpp | 13 ++++------
 example/starvephil.cpp      | 13 ++++------
 example/tennis.cpp          | 13 ++++------
 example/thread_group.cpp    | 14 ++++-------
 example/tss.cpp             | 13 ++++------
 example/xtime.cpp           | 13 ++++------
 12 files changed, 74 insertions(+), 118 deletions(-)

diff --git a/example/Jamfile b/example/Jamfile
index 4a0fc96d..c4e4d56d 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -1,19 +1,19 @@
-# Copyright 2006 Roland Schwarz.
-# # 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)
-# #
-# # This work is a reimplementation along the design and ideas
-# # of William E. Kempf.
+# Copyright (C) 2006 Roland Schwarz.
+# 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)
+#
+# This work is a reimplementation along the design and ideas
+# of William E. Kempf.
 #
 
 # The threading library is available in two versions.
-# Native to the environment and based upon pthread.
+# Native to the environment or based ontop pthread.
 # To select which version to use you need to define
 # BOOST_THREAD_POSIX when compiling your sources.
 # If BOOST_THREAD_POSIX is defined this will choose
 # pthread implementation.
-# You also need to compile the correct library version by
+# You also need to specify the correct library version by
 # specifying the the <lib> or <dll> tags.
 # <lib>@boost/libs/thread/build/boost_thread for static native and
 # <lib>@boost/libs/thread/build/boost_thread_pthread static pthread.
@@ -23,23 +23,25 @@ project-root ;
 
 template example
         : ## sources ##
-	  <template>@boost/libs/thread/build/includes
-	  #<lib>@boost/libs/thread/build/boost_thread
-	  <lib>@boost/libs/thread/build/boost_thread_pthread
+	  <lib>@boost/libs/thread/build/boost_thread
+	  #<lib>@boost/libs/thread/build/boost_thread_pthread
+	  #<dll>@boost/libs/thread/build/boost_thread
+	  #<dll>@boost/libs/thread/build/boost_thread_pthread
         : ## requirements ##
-	  <define>BOOST_THREAD_POSIX
+	  <include>$(BOOST_ROOT)
+	  #<define>BOOST_THREAD_POSIX
         : ## default build ##
           <threading>multi
     	;
 
-#exe monitor : <template>example monitor.cpp ;
-#exe starvephil : <template>example starvephil.cpp ;
-#exe tennis : <template>example tennis.cpp ;
-#exe condition : <template>example condition.cpp ;
-#exe mutex : <template>example mutex.cpp ;
-#exe once : <template>example once.cpp ;
-#exe recursive_mutex : <template>example recursive_mutex.cpp ;
+exe monitor : <template>example monitor.cpp ;
+exe starvephil : <template>example starvephil.cpp ;
+exe tennis : <template>example tennis.cpp ;
+exe condition : <template>example condition.cpp ;
+exe mutex : <template>example mutex.cpp ;
+exe once : <template>example once.cpp ;
+exe recursive_mutex : <template>example recursive_mutex.cpp ;
 exe thread : <template>example thread.cpp ;
-#exe thread_group : <template>example thread_group.cpp ;
-#exe tss : <template>example tss.cpp ;
-#exe xtime : <template>example xtime.cpp ;
+exe thread_group : <template>example thread_group.cpp ;
+exe tss : <template>example tss.cpp ;
+exe xtime : <template>example xtime.cpp ;
diff --git a/example/Jamrules b/example/Jamrules
index 5f8ad8d1..fd7fc5d3 100644
--- a/example/Jamrules
+++ b/example/Jamrules
@@ -1,4 +1,5 @@
-# Copyright 2006 Roland Schwarz.
+# Copyright 2003 William E. Kempf
+# Copyright 2006 Roland Schwarz
 # 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)
@@ -12,14 +13,15 @@ project example ;
 # path to point at the root directory of your Boost installation (the
 # one containing a subdirectory called "boost/".
 path-global BOOST_ROOT : ../../.. ;
+
 # Makes a project id for boost so that other Boost.Build projects can
 # refer to it by name.
 #
 project boost : $(BOOST_ROOT) ;
 
-# Attn: path-global was broken in my version of bbv1, so I did not use it.
-# if you want to fix it, you'd need to fix the project rule in 
-# allyourbase.jam as shown below:
+# Attn: path-global was broken in my version of bbv1, which prevented specifying
+# BOOST_ROOT as a relative path. So I needed to apply
+# the below fix in allyourbase.jam as shown below:
 #
 #rule project ( name : location ? )
 #{
diff --git a/example/condition.cpp b/example/condition.cpp
index 0d5c1a26..374ca546 100644
--- a/example/condition.cpp
+++ b/example/condition.cpp
@@ -1,13 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
 
 #include <iostream>
 #include <vector>
@@ -43,7 +38,8 @@ public:
     }
 
 private:
-    int begin, end, buffered;
+    int begin, end;
+    std::vector<int>::size_type buffered;
     std::vector<int> circular_buf;
     boost::condition buffer_not_full, buffer_not_empty;
     boost::mutex monitor;
diff --git a/example/monitor.cpp b/example/monitor.cpp
index a18e47d5..2e6841cc 100644
--- a/example/monitor.cpp
+++ b/example/monitor.cpp
@@ -1,13 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
 
 #include <vector>
 #include <iostream>
diff --git a/example/mutex.cpp b/example/mutex.cpp
index b9b71b14..75cd8daf 100644
--- a/example/mutex.cpp
+++ b/example/mutex.cpp
@@ -1,13 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
diff --git a/example/once.cpp b/example/once.cpp
index 13650d3b..2e247d8f 100644
--- a/example/once.cpp
+++ b/example/once.cpp
@@ -1,13 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/once.hpp>
diff --git a/example/recursive_mutex.cpp b/example/recursive_mutex.cpp
index 18fcb583..86db3ce7 100644
--- a/example/recursive_mutex.cpp
+++ b/example/recursive_mutex.cpp
@@ -1,13 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
 
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/thread.hpp>
diff --git a/example/starvephil.cpp b/example/starvephil.cpp
index a293cfa1..1dcd91e9 100644
--- a/example/starvephil.cpp
+++ b/example/starvephil.cpp
@@ -1,13 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
diff --git a/example/tennis.cpp b/example/tennis.cpp
index 238f963f..4984b3d4 100644
--- a/example/tennis.cpp
+++ b/example/tennis.cpp
@@ -1,13 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
diff --git a/example/thread_group.cpp b/example/thread_group.cpp
index bdfcf26e..8f57aaa0 100644
--- a/example/thread_group.cpp
+++ b/example/thread_group.cpp
@@ -1,13 +1,9 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
+
 
 #include <boost/thread/thread.hpp>
 #include <iostream>
diff --git a/example/tss.cpp b/example/tss.cpp
index 68504aa7..6f52e1a2 100644
--- a/example/tss.cpp
+++ b/example/tss.cpp
@@ -1,13 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/tss.hpp>
diff --git a/example/xtime.cpp b/example/xtime.cpp
index ad42b1d8..3654bb8e 100644
--- a/example/xtime.cpp
+++ b/example/xtime.cpp
@@ -1,13 +1,8 @@
-// Copyright (C) 2001-2003
-// William E. Kempf
+// Copyright (C) 2001-2003 William E. Kempf
+// 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
 //
-// Permission to use, copy, modify, distribute and sell this software
-// and its documentation for any purpose is hereby granted without fee,
-// provided that the above copyright notice appear in all copies and
-// that both that copyright notice and this permission notice appear
-// in supporting documentation.  William E. Kempf makes no representations
-// about the suitability of this software for any purpose.
-// It is provided "as is" without express or implied warranty.
 
 #include <boost/thread/thread.hpp>
 #include <boost/thread/xtime.hpp>