- Olena-patches

[Olena] #241: Have Qmake honor CXX and adjust its parameters according to the compiler's abilities
by Olena Trac 29 Nov '10

29 Nov '10

#241: Have Qmake honor CXX and adjust its parameters according to the compiler's abilities ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Component: Olena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Context: qmake is used by `configure` to set flags like `QT_CXXFLAGS`, `QT_LDFLAGS`, etc. (thanks to `autotroll.m4`). Qmake does not set compiler/linker flags based on tests on the tools themselves; instead, it queries the environment and sets variables according to some recipe (the « `spec` »). This is annoying on Mac OS X, since the `spec` detected and used by Qmake on this OS (`macx-g++`) adds Apple-specific flags to `QT_CXXFLAGS`, `QT_LDFLAGS`, etc., namely « `-arch x86_64 -Xarch_x86_64` » on Intel64 hosts. This prevents Qt-dependent components from being built with a non Apple compiler (e.g., `g++` 4.5 from the !MacPorts). We cannot really solve this problem entirely because it implies patching qmake. We can however write some workaround in `autotroll.m4` for known cases (like this one). In the current case, if non-standard flags `-arch` and/or `-Xarch` are detected in the `Makefile` generated by qmake, we should try to run `make` in the `conftest.dir` directory with CXX set to the value found ealier by `configure`. If this fails, try again with `-arch` and/or `-Xarch` removed from `QT_CXXFLAGS`, `QT_LDFLAGS`, etc. -- Ticket URL: <https://trac.lrde.org/olena/ticket/241> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

last-svn-commit-535-g47737dc Work around g++ 4.5 deficiencies to compile Milena.
by Roland Levillain 29 Nov '10

29 Nov '10

* mln/core/concept/proxy.hxx (internal::helper_unproxy_rec< P, true >::P_) (internal::helper_unproxy_rec< const P, true >::P_): Remove these intermediate typedefs... (internal::helper_unproxy_rec< P, true >::ret) (internal::helper_unproxy_rec< const P, true >::ret): ...to inline these definitions. * mln/util/array.hh (internal::subject_impl<util::array<T>&, E>::operator()) (internal::subject_impl<util::array<T>&, E>::operator[]) (internal::subject_impl<const util::array<T>&, E>::operator() const) (internal::subject_impl<const util::array<T>&, E>::operator[] const): * mln/core/site_set/p_graph_piter.hh (internal::subject_impl< const p_graph_piter<S,I>&, E >::graph): Use the exact same return type as in the declaration. --- milena/ChangeLog | 20 ++++++++++++++++++++ milena/mln/core/concept/proxy.hxx | 6 ++---- milena/mln/core/site_set/p_graph_piter.hh | 2 +- milena/mln/util/array.hh | 8 ++++---- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4141442..9f07662 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,25 @@ 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + Work around g++ 4.5 deficiencies to compile Milena. + + * mln/core/concept/proxy.hxx + (internal::helper_unproxy_rec< P, true >::P_) + (internal::helper_unproxy_rec< const P, true >::P_): + Remove these intermediate typedefs... + (internal::helper_unproxy_rec< P, true >::ret) + (internal::helper_unproxy_rec< const P, true >::ret): + ...to inline these definitions. + * mln/util/array.hh + (internal::subject_impl<util::array<T>&, E>::operator()) + (internal::subject_impl<util::array<T>&, E>::operator[]) + (internal::subject_impl<const util::array<T>&, E>::operator() const) + (internal::subject_impl<const util::array<T>&, E>::operator[] const): + * mln/core/site_set/p_graph_piter.hh + (internal::subject_impl< const p_graph_piter<S,I>&, E >::graph): + Use the exact same return type as in the declaration. + +2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix forward declarations in complex piters. * mln/core/site_set/p_complex_piter.hh, diff --git a/milena/mln/core/concept/proxy.hxx b/milena/mln/core/concept/proxy.hxx index d50b3aa..2f77cec 100644 --- a/milena/mln/core/concept/proxy.hxx +++ b/milena/mln/core/concept/proxy.hxx @@ -92,16 +92,14 @@ namespace mln template <typename P> struct helper_unproxy_rec< P, true > { - typedef mln_exact(P) P_; - typedef typename P_::HOT_actual_subject ret; + typedef mln_exact(P)::HOT_actual_subject ret; static ret on(P& p); }; template <typename P> struct helper_unproxy_rec< const P, true > { - typedef mln_exact(P) P_; - typedef mlc_const(typename P_::HOT_actual_subject) ret; + typedef mlc_const(mln_exact(P)::HOT_actual_subject) ret; static ret on(const P& p); }; diff --git a/milena/mln/core/site_set/p_graph_piter.hh b/milena/mln/core/site_set/p_graph_piter.hh index ec082a6..12b7e0d 100644 --- a/milena/mln/core/site_set/p_graph_piter.hh +++ b/milena/mln/core/site_set/p_graph_piter.hh @@ -257,7 +257,7 @@ namespace mln template <typename S, typename I, typename E> inline - const typename S::graph_t& + const typename subject_impl< const p_graph_piter<S,I>&, E >::graph_t& subject_impl< const p_graph_piter<S,I>&, E >::graph() const { return exact_().get_subject().graph(); diff --git a/milena/mln/util/array.hh b/milena/mln/util/array.hh index b64511e..0fe34e7 100644 --- a/milena/mln/util/array.hh +++ b/milena/mln/util/array.hh @@ -846,7 +846,7 @@ namespace mln template <typename T, typename E> inline - typename util::array<T>::mutable_result + typename subject_impl<util::array<T>&, E>::mutable_result subject_impl<util::array<T>&, E>::operator()(unsigned i) { return exact_().get_subject()(i); @@ -854,7 +854,7 @@ namespace mln template <typename T, typename E> inline - typename util::array<T>::mutable_result + typename subject_impl<util::array<T>&, E>::mutable_result subject_impl<util::array<T>&, E>::operator[](unsigned i) { return exact_().get_subject()[i]; @@ -919,7 +919,7 @@ namespace mln template <typename T, typename E> inline - typename util::array<T>::ro_result + typename subject_impl<const util::array<T>&, E>::ro_result subject_impl<const util::array<T>&, E>::operator()(unsigned i) const { return exact_().get_subject()(i); @@ -927,7 +927,7 @@ namespace mln template <typename T, typename E> inline - typename util::array<T>::ro_result + typename subject_impl<const util::array<T>&, E>::ro_result subject_impl<const util::array<T>&, E>::operator[](unsigned i) const { return exact_().get_subject()[i]; -- 1.5.6.5

1 0

last-svn-commit-692-g911aaa7 scribo/toolchain/text_in_doc.hh: Set english as default recognized language.
by Guillaume Lazzara 29 Nov '10

29 Nov '10

--- scribo/ChangeLog | 5 +++++ scribo/scribo/toolchain/text_in_doc.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3bfaebe..47708cf 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/toolchain/text_in_doc.hh: Set english as default + recognized language. + +2010-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/content_in_doc.cc: Add missing ImageMagick initialization. 2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/toolchain/text_in_doc.hh b/scribo/scribo/toolchain/text_in_doc.hh index 279ac13..82094d4 100644 --- a/scribo/scribo/toolchain/text_in_doc.hh +++ b/scribo/scribo/toolchain/text_in_doc.hh @@ -287,7 +287,7 @@ namespace scribo - scribo::text::recognition(lines, "fra"); + scribo::text::recognition(lines, "eng"); return lines; } -- 1.5.6.5

1 0

last-svn-commit-691-g680fbed Add missing ImageMagick initialization.
by Guillaume Lazzara 29 Nov '10

29 Nov '10

--- scribo/ChangeLog | 4 ++++ scribo/src/content_in_doc.cc | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9f7bc9b..3bfaebe 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + * src/content_in_doc.cc: Add missing ImageMagick initialization. + 2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> Distribute more files with Scribo. diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_doc.cc index fe3eacf..6613e22 100644 --- a/scribo/src/content_in_doc.cc +++ b/scribo/src/content_in_doc.cc @@ -100,6 +100,8 @@ int main(int argc, char* argv[]) trace::entering("main"); + Magick::InitializeMagick(*argv); + typedef image2d<scribo::def::lbl_type> L; scribo::document<L> doc(argv[1]); -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-690-g3d16fd3
by lazzara＠lrde.epita.fr 25 Nov '10

25 Nov '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next-build-test has been updated via 3d16fd32fef9d30de88637605ed81a83c0d2f778 (commit) via 4183f619f4bc24a7c292421508affe58e08c3270 (commit) from d58738a0e23770f8795a83ca5912d167fcd541af (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 3d16fd3 mln/io/magick/save.hh: Fix a crash when using GraphicsMagick instead of ImageMagick. 4183f61 Fix encoding issues in xml_transform. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/mln/io/magick/save.hh | 15 ++++++++++++--- scribo/sandbox/ChangeLog | 7 +++++++ scribo/sandbox/arthur/xml_transform/image_crop.cc | 2 ++ scribo/sandbox/arthur/xml_transform/loader.cc | 2 ++ 5 files changed, 28 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-690-g3d16fd3 mln/io/magick/save.hh: Fix a crash when using GraphicsMagick instead of ImageMagick.
by Guillaume Lazzara 25 Nov '10

25 Nov '10

--- milena/ChangeLog | 5 +++++ milena/mln/io/magick/save.hh | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f853179..8e43f9f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2010-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/magick/save.hh: Fix a crash when using GraphicsMagick + instead of ImageMagick. + 2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> Add a fastest implementation in io::magick. diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index 7282414..2ea2957 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -158,12 +158,21 @@ namespace mln ncols = geom::ncols(ima), nrows = geom::nrows(ima); - - Magick::Image magick_ima; // In the construction of a Geometry object, the width (i.e. // `ncols') comes first, then the height (i.e. `nrows') // follows. - magick_ima.size(Magick::Geometry(ncols, nrows)); + // + // FIXME: Default pixel value is set to "white". If the image is + // declared with the default constructor, without specifying a + // default value, no data seems to be allocated and the Pixel view + // declared further fails and segfault... + Magick::Image magick_ima(Magick::Geometry(ncols, nrows), "white"); + + magick_ima.type(Magick::TrueColorType); + + // Ensure that there is only one reference to underlying image + // If this is not done, then image pixels will not be modified. + magick_ima.modifyImage(); Magick::Pixels view(magick_ima); // As above, `ncols' is passed before `nrows'. -- 1.5.6.5

1 0

last-svn-commit-689-g4183f61 Fix encoding issues in xml_transform.
by Guillaume Lazzara 25 Nov '10

25 Nov '10

* arthur/xml_transform/image_crop.cc, * arthur/xml_transform/loader.cc: Explicitly use UTF-8. --- scribo/sandbox/ChangeLog | 7 +++++++ scribo/sandbox/arthur/xml_transform/image_crop.cc | 2 ++ scribo/sandbox/arthur/xml_transform/loader.cc | 2 ++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 2779292..24b948f 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,10 @@ +2010-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix encoding issues in xml_transform. + + * arthur/xml_transform/image_crop.cc, + * arthur/xml_transform/loader.cc: Explicitly use UTF-8. + 2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> Improve image cropping in xml_transform. diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.cc b/scribo/sandbox/arthur/xml_transform/image_crop.cc index d2787f1..f439d8e 100644 --- a/scribo/sandbox/arthur/xml_transform/image_crop.cc +++ b/scribo/sandbox/arthur/xml_transform/image_crop.cc @@ -147,10 +147,12 @@ void ImageCrop::to_base64(const QString& out_file, bool no_crop) file.close(); file.open(QIODevice::ReadOnly); QTextStream stream(&file); + stream.setCodec("UTF-8"); QFile file2(out_file); file2.open(QIODevice::ReadWrite); QTextStream stream2(&file2); + stream2.setCodec("UTF-8"); QString line = stream.readLine(); stream2 << line; diff --git a/scribo/sandbox/arthur/xml_transform/loader.cc b/scribo/sandbox/arthur/xml_transform/loader.cc index f9316f2..c5527fd 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.cc +++ b/scribo/sandbox/arthur/xml_transform/loader.cc @@ -164,6 +164,8 @@ bool Loader::xml_output(const QString& xml_file, bool html, const QString& outpu QTextStream stream_in(&file); QTextStream stream_out(&out_file); + stream_in.setCodec("UTF-8"); + stream_out.setCodec("UTF-8"); QString line = stream_in.readLine(); -- 1.5.6.5

1 0

branch fix-ostream-use deleted: last-svn-commit-530-g7186af4
by git＠lrde.epita.fr 22 Nov '10

22 Nov '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch fix-ostream-use has been deleted was 7186af46bed3e9755e7c319178fdf677b42efdce ----------------------------------------------------------------------- 7186af46bed3e9755e7c319178fdf677b42efdce Fix output streams uses. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-530-g7186af4
by git＠lrde.epita.fr 22 Nov '10

22 Nov '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 7186af46bed3e9755e7c319178fdf677b42efdce (commit) via 0be53fd662d3b5ae1c7d3740e07710df4a95c0a6 (commit) from 0d8813e68ce7b27f4e0af6ee0a6004d0564b5945 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 6 ++-- ChangeLog | 4 +++ milena/ChangeLog | 17 ++++++++++++++ milena/mln/core/concept/value_set.hh | 5 ++- milena/mln/morpho/tree/data.hh | 5 ++- milena/mln/trace/warning.hh | 10 ++++---- milena/mln/util/fibonacci_heap.hh | 40 +++++++++++++++++----------------- 7 files changed, 55 insertions(+), 32 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-530-g7186af4 Fix output streams uses.
by Roland Levillain 22 Nov '10

22 Nov '10

* mln/core/concept/value_set.hh (operator<<(std::ostream&, const Value_Set<E>&)) * mln/morpho/tree/data.hh (operator<< (std::ostream&, const tree::data<I, S>&)): Use the stream passed as argument instead of std::cout. * mln/util/fibonacci_heap.hh (mln::util::internal::fibonacci_heap_node::print_): Take an output stream as argument instead of using the standard output. (mln::util::fibonacci_heap::print_): Rename first argument from `cout' to `ostr' prevent confusions with std::cout. * mln/trace/warning.hh (mln::trace::warning): Print warnings on the standard error instead of the standard ourput. --- milena/ChangeLog | 17 ++++++++++++++ milena/mln/core/concept/value_set.hh | 5 ++- milena/mln/morpho/tree/data.hh | 5 ++- milena/mln/trace/warning.hh | 10 ++++---- milena/mln/util/fibonacci_heap.hh | 40 +++++++++++++++++----------------- 5 files changed, 48 insertions(+), 29 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2b6ae78..20a3967 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2010-07-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix output streams uses. + + * mln/core/concept/value_set.hh + (operator<<(std::ostream&, const Value_Set<E>&)) + * mln/morpho/tree/data.hh + (operator<< (std::ostream&, const tree::data<I, S>&)): + Use the stream passed as argument instead of std::cout. + * mln/util/fibonacci_heap.hh + (mln::util::internal::fibonacci_heap_node::print_): Take an output + stream as argument instead of using the standard output. + (mln::util::fibonacci_heap::print_): Rename first argument from + `cout' to `ostr' prevent confusions with std::cout. + * mln/trace/warning.hh (mln::trace::warning): Print warnings on + the standard error instead of the standard ourput. + 2010-10-28 Roland Levillain <roland(a)lrde.epita.fr> Handle properly non 8-bit Magick::Quantum's. diff --git a/milena/mln/core/concept/value_set.hh b/milena/mln/core/concept/value_set.hh index 83f9911..b047ab0 100644 --- a/milena/mln/core/concept/value_set.hh +++ b/milena/mln/core/concept/value_set.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -104,7 +105,7 @@ namespace mln const E& vs = exact(vs_); ostr << "{ "; for (unsigned i = 0; i < vs.nvalues(); ++i) - std::cout << vs[i] << ' '; + ostr << vs[i] << ' '; return ostr << '}'; } diff --git a/milena/mln/morpho/tree/data.hh b/milena/mln/morpho/tree/data.hh index 91f69ec..1a0c404 100644 --- a/milena/mln/morpho/tree/data.hh +++ b/milena/mln/morpho/tree/data.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -744,7 +745,7 @@ namespace mln typename self_t::depth1st_piter n(t); mln_psite(self_t) old; - std::cout << std::endl << "Hierarchy: " << std::endl; + os << std::endl << "Hierarchy: " << std::endl; n.start(); if (!n.is_valid()) diff --git a/milena/mln/trace/warning.hh b/milena/mln/trace/warning.hh index c06fd7f..01a82a2 100644 --- a/milena/mln/trace/warning.hh +++ b/milena/mln/trace/warning.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -30,8 +31,8 @@ /// /// Display warning message in trace output. -# include <string> # include <iostream> +# include <string> # include <mln/trace/quiet.hh> @@ -44,14 +45,13 @@ namespace mln void warning(const std::string& message); + # ifndef MLN_INCLUDE_ONLY inline void warning(const std::string& message) { - std::cout << "Warning: " - << message - << std::endl; + std::cerr << "Warning: " << message << std::endl; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/util/fibonacci_heap.hh b/milena/mln/util/fibonacci_heap.hh index 9742edf..daec0a1 100644 --- a/milena/mln/util/fibonacci_heap.hh +++ b/milena/mln/util/fibonacci_heap.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -87,7 +87,7 @@ namespace mln bool operator==(fibonacci_heap_node<P,T>& rhs); bool operator<(fibonacci_heap_node<P,T>& rhs); - void print_() const; + void print_(std::ostream& ostr) const; private: @@ -164,7 +164,7 @@ namespace mln - std::ostream& print_(std::ostream& cout, + std::ostream& print_(std::ostream& ostr, internal::fibonacci_heap_node<P,T> *tree = 0, internal::fibonacci_heap_node<P,T> *parent = 0) const; @@ -245,7 +245,7 @@ namespace mln template <typename P, typename T> std::ostream& - operator<<(std::ostream& cout, const fibonacci_heap<P,T>& heap); + operator<<(std::ostream& ostr, const fibonacci_heap<P,T>& heap); @@ -453,9 +453,9 @@ namespace mln template <typename P, typename T> inline - void fibonacci_heap_node<P,T>::print_() const + void fibonacci_heap_node<P,T>::print_(std::ostream& ostr) const { - std::cout << value_ << " (" << priority_ << ")"; + ostr << value_ << " (" << priority_ << ")"; } @@ -767,7 +767,7 @@ namespace mln template <typename P, typename T> std::ostream& - fibonacci_heap<P,T>::print_(std::ostream& cout, + fibonacci_heap<P,T>::print_(std::ostream& ostr, internal::fibonacci_heap_node<P,T> *tree, internal::fibonacci_heap_node<P,T> *parent) const { @@ -781,38 +781,38 @@ namespace mln { do { if (temp->left() == 0) - cout << "(left is 0)"; + ostr << "(left is 0)"; temp->print_(); if (temp->parent() != parent) - cout << "(parent is incorrect)"; + ostr << "(parent is incorrect)"; if (temp->right() == 0) - cout << "(right is 0)"; + ostr << "(right is 0)"; else if (temp->right()->left() != temp) - cout << "(Error in left link left) ->"; + ostr << "(Error in left link left) ->"; else - cout << " <-> "; + ostr << " <-> "; temp = temp->right(); } while (temp != 0 && temp != tree); } else - cout << " <empty>" << std::endl; - cout << std::endl; + ostr << " <empty>" << std::endl; + ostr << std::endl; temp = tree; if (temp != 0) { do { - cout << "children of " << temp->value() << ": "; + ostr << "children of " << temp->value() << ": "; if (temp->child() == 0) - cout << "NONE" << std::endl; - else print_(cout, temp->child(), temp); + ostr << "NONE" << std::endl; + else print_(ostr, temp->child(), temp); temp = temp->right(); } while (temp!=0 && temp != tree); } - return cout; + return ostr; } @@ -1029,9 +1029,9 @@ namespace mln template <typename P, typename T> std::ostream& - operator<<(std::ostream& cout, const fibonacci_heap<P,T>& heap) + operator<<(std::ostream& ostr, const fibonacci_heap<P,T>& heap) { - return heap.print_(cout); + return heap.print_(ostr); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0