https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Fix the definition of static abortion. * mln/metal/abort.hh (mln::metal::abort): Rename as... (mln::metal::abort_): ...this, to avoid name clashes with the homonym (standard) macro. abort.hh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) Index: mln/metal/abort.hh --- mln/metal/abort.hh (revision 1645) +++ mln/metal/abort.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_METAL_ABORT_HH # define MLN_METAL_ABORT_HH -/*! - * \file mln/metal/abort.hh +/*! \file mln/metal/abort.hh * - * \brief FIXME. + * \brief FIXME: Document. */ # include <mln/metal/bool.hh> @@ -44,10 +43,9 @@ { template <typename T> - struct abort : false_ + struct abort_ : false_ {}; - } // end of namespace mln::metal } // end of namespace mln