Commit 7910614b authored by Robert Ricci's avatar Robert Ricci

Mention the patches that have to be applied to the g++ and boost

headers in order for the new assign to function properly.

Add a new 'patches' directory to store these, and other patches.
parent fae54dc9
...@@ -50,6 +50,13 @@ IMPORTANT: The mhash package should be installed _before_ the mod_php4 port is ...@@ -50,6 +50,13 @@ IMPORTANT: The mhash package should be installed _before_ the mod_php4 port is
built. When building mod_php4, you will be given a menu to choose the various built. When building mod_php4, you will be given a menu to choose the various
features you want support for. Make sure to select support for mhash. features you want support for. Make sure to select support for mhash.
IMPORTANT: There is a bug in the g++ headers that come with FreeBSD 4.3 - we
assume that it has been fixed in newer versions, but are not sure. BEFORE you
build the testbed software, be sure to apply the 'g++.patch' file from the
patches/ directory. (As root, 'patch -p0 < g++.patch') Also, the version of
bosst from the FreeBSD package has a bug, sou you'll need to apply
'boost.patch' (using the same method) before you build as well.
Note on TCL: Do NOT install tcl83; otcl, which is used by some testbed Note on TCL: Do NOT install tcl83; otcl, which is used by some testbed
scripts, requires tcl82. When you install the tcl-sql package, it will be put scripts, requires tcl82. When you install the tcl-sql package, it will be put
in the library directory for the latest version of tcl you have installed, so in the library directory for the latest version of tcl you have installed, so
......
diff -rcN /usr/local/include/boost.orig/graph/dijkstra_shortest_paths.hpp /usr/local/include/boost/graph/dijkstra_shortest_paths.hpp
*** /usr/local/include/boost.orig/graph/dijkstra_shortest_paths.hpp Fri Sep 20 14:12:02 2002
--- /usr/local/include/boost/graph/dijkstra_shortest_paths.hpp Mon Sep 23 12:39:36 2002
***************
*** 39,44 ****
--- 39,45 ----
#include <boost/pending/mutable_queue.hpp>
#include <boost/graph/relax.hpp>
#include <boost/pending/indirect_cmp.hpp>
+ #include <boost/graph/exception.hpp>
namespace boost {
***************
*** 62,68 ****
template <class Visitors = null_visitor>
class dijkstra_visitor : public bfs_visitor<Visitors> {
public:
! dijkstra_visitor(Visitors vis = Visitors())
: bfs_visitor<Visitors>(vis) { }
template <class Edge, class Graph>
--- 63,70 ----
template <class Visitors = null_visitor>
class dijkstra_visitor : public bfs_visitor<Visitors> {
public:
! dijkstra_visitor() { }
! dijkstra_visitor(Visitors vis)
: bfs_visitor<Visitors>(vis) { }
template <class Edge, class Graph>
***************
*** 127,133 ****
template <class Vertex, class Graph>
void examine_vertex(Vertex u, Graph& g) { m_vis.examine_vertex(u, g); }
template <class Edge, class Graph>
! void examine_edge(Edge e, Graph& g) { m_vis.examine_edge(e, g); }
template <class Edge, class Graph>
void black_target(Edge, Graph&) { }
template <class Vertex, class Graph>
--- 129,139 ----
template <class Vertex, class Graph>
void examine_vertex(Vertex u, Graph& g) { m_vis.examine_vertex(u, g); }
template <class Edge, class Graph>
! void examine_edge(Edge e, Graph& g) {
! if (get(m_weight, e) < 0)
! throw negative_edge();
! m_vis.examine_edge(e, g);
! }
template <class Edge, class Graph>
void black_target(Edge, Graph&) { }
template <class Vertex, class Graph>
***************
*** 200,207 ****
}
put(distance, s, zero);
! dijkstra_shortest_paths(g, s, predecessor, distance, weight,
! index_map, compare, combine, inf, zero, vis);
}
namespace detail {
--- 206,213 ----
}
put(distance, s, zero);
! dijkstra_shortest_paths_no_init(g, s, predecessor, distance, weight,
! index_map, compare, combine, inf, zero, vis);
}
namespace detail {
diff -rcN /usr/local/include/boost.orig/graph/exception.hpp /usr/local/include/boost/graph/exception.hpp
*** /usr/local/include/boost.orig/graph/exception.hpp Wed Dec 31 17:00:00 1969
--- /usr/local/include/boost/graph/exception.hpp Thu Jun 6 11:04:09 2002
***************
*** 0 ****
--- 1,57 ----
+ //=======================================================================
+ // Copyright 2002 Indiana University.
+ // Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
+ //
+ // This file is part of the Boost Graph Library
+ //
+ // You should have received a copy of the License Agreement for the
+ // Boost Graph Library along with the software; see the file LICENSE.
+ //
+ // Permission to modify the code and to distribute modified code is
+ // granted, provided the text of this NOTICE is retained, a notice that
+ // the code was modified is included with the above COPYRIGHT NOTICE and
+ // with the COPYRIGHT NOTICE in the LICENSE file, and that the LICENSE
+ // file is distributed with the modified code.
+ //
+ // LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.
+ // By way of example, but not limitation, Licensor MAKES NO
+ // REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
+ // PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE COMPONENTS
+ // OR DOCUMENTATION WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS
+ // OR OTHER RIGHTS.
+ //=======================================================================
+
+ #ifndef BOOST_GRAPH_EXCEPTION_HPP
+ #define BOOST_GRAPH_EXCEPTION_HPP
+
+ #include <stdexcept>
+
+ namespace boost {
+
+ struct bad_graph : public std::invalid_argument {
+ bad_graph(const std::string& what_arg)
+ : std::invalid_argument(what_arg) { }
+ };
+
+ struct not_a_dag : public bad_graph {
+ not_a_dag()
+ : bad_graph("The graph must be a DAG.") { }
+ };
+
+ struct negative_edge : public bad_graph {
+ negative_edge()
+ : bad_graph("The graph may not contain an edge with negative weight."){ }
+ };
+
+ struct negative_cycle : public bad_graph {
+ negative_cycle()
+ : bad_graph("The graph may not contain negative cycles.") { }
+ };
+ struct not_connected : public bad_graph {
+ not_connected()
+ : bad_graph("The graph must be connected.") { }
+ };
+
+ } // namespace boost
+
+ #endif // BOOST_GRAPH_EXCEPTION_HPP
diff -rcN /usr/include/g++.orig/stl_rope.h /usr/include/g++/stl_rope.h
*** /usr/include/g++.orig/stl_rope.h Sat Apr 21 03:06:09 2001
--- /usr/include/g++/stl_rope.h Thu Jun 6 13:25:54 2002
***************
*** 387,393 ****
_Rope_RopeRep(_Tag __t, int __d, bool __b, size_t __size,
allocator_type __a)
: _Rope_rep_base<_CharT,_Alloc>(__size, __a),
! _M_tag(__t), _M_depth(__d), _M_is_balanced(__b), _M_c_string(0)
{
# ifndef __GC
_M_refcount = 1;
--- 387,393 ----
_Rope_RopeRep(_Tag __t, int __d, bool __b, size_t __size,
allocator_type __a)
: _Rope_rep_base<_CharT,_Alloc>(__size, __a),
! _M_tag(__t), _M_is_balanced(__b), _M_depth(__d), _M_c_string(0)
{
# ifndef __GC
_M_refcount = 1;
***************
*** 865,872 ****
protected:
enum { _S_path_cache_len = 4 }; // Must be <= 9.
enum { _S_iterator_buf_len = 15 };
- size_t _M_current_pos;
_RopeRep* _M_root; // The whole rope.
size_t _M_leaf_pos; // Starting position for current leaf
__GC_CONST _CharT* _M_buf_start;
// Buffer possibly
--- 865,872 ----
protected:
enum { _S_path_cache_len = 4 }; // Must be <= 9.
enum { _S_iterator_buf_len = 15 };
_RopeRep* _M_root; // The whole rope.
+ size_t _M_current_pos;
size_t _M_leaf_pos; // Starting position for current leaf
__GC_CONST _CharT* _M_buf_start;
// Buffer possibly
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment