|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49136 - in branches/bcbboost/boost: graph spirit/home/phoenix/core/detail spirit/home/phoenix/scope spirit/home/phoenix/scope/detail spirit/home/phoenix/stl/container tr1
From: nicola.musatti_at_[hidden]
Date: 2008-10-05 04:13:31
Author: nmusatti
Date: 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
New Revision: 49136
URL: http://svn.boost.org/trac/boost/changeset/49136
Log:
Merge from trunk
Text files modified:
branches/bcbboost/boost/graph/is_straight_line_drawing.hpp | 28 ++++++++++++++++++++++++----
branches/bcbboost/boost/spirit/home/phoenix/core/detail/function_eval.hpp | 12 ++++++++++--
branches/bcbboost/boost/spirit/home/phoenix/scope/detail/local_gen.hpp | 4 +---
branches/bcbboost/boost/spirit/home/phoenix/scope/detail/local_variable.hpp | 25 +------------------------
branches/bcbboost/boost/spirit/home/phoenix/scope/local_variable.hpp | 2 +-
branches/bcbboost/boost/spirit/home/phoenix/stl/container/container.hpp | 2 +-
branches/bcbboost/boost/tr1/array.hpp | 7 ++++++-
branches/bcbboost/boost/tr1/random.hpp | 7 ++++++-
branches/bcbboost/boost/tr1/regex.hpp | 7 ++++++-
branches/bcbboost/boost/tr1/tuple.hpp | 7 ++++++-
branches/bcbboost/boost/tr1/type_traits.hpp | 9 ++++++++-
branches/bcbboost/boost/tr1/unordered_map.hpp | 7 ++++++-
branches/bcbboost/boost/tr1/unordered_set.hpp | 7 ++++++-
13 files changed, 82 insertions(+), 42 deletions(-)
Modified: branches/bcbboost/boost/graph/is_straight_line_drawing.hpp
==============================================================================
--- branches/bcbboost/boost/graph/is_straight_line_drawing.hpp (original)
+++ branches/bcbboost/boost/graph/is_straight_line_drawing.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -164,7 +164,7 @@
edge_t e(get<0>(*itr));
vertex_t source_v(source(e,g));
vertex_t target_v(target(e,g));
- if (drawing[source_v].x > drawing[target_v].x)
+ if (drawing[source_v].y > drawing[target_v].y)
std::swap(source_v, target_v);
active_map_key_t key(get(drawing, source_v).y,
@@ -187,12 +187,32 @@
before = prior(a_itr);
after = next(a_itr);
- if (after != active_edges.end() || before != active_edges.end())
+ if (before != active_edges.end())
{
- edge_t f = after != active_edges.end() ?
- after->second : before->second;
+ edge_t f = before->second;
+ vertex_t e_source(source(e,g));
+ vertex_t e_target(target(e,g));
+ vertex_t f_source(source(f,g));
+ vertex_t f_target(target(f,g));
+ if (intersects(drawing[e_source].x,
+ drawing[e_source].y,
+ drawing[e_target].x,
+ drawing[e_target].y,
+ drawing[f_source].x,
+ drawing[f_source].y,
+ drawing[f_target].x,
+ drawing[f_target].y
+ )
+ )
+ return false;
+ }
+
+ if (after != active_edges.end())
+ {
+
+ edge_t f = after->second;
vertex_t e_source(source(e,g));
vertex_t e_target(target(e,g));
vertex_t f_source(source(f,g));
Modified: branches/bcbboost/boost/spirit/home/phoenix/core/detail/function_eval.hpp
==============================================================================
--- branches/bcbboost/boost/spirit/home/phoenix/core/detail/function_eval.hpp (original)
+++ branches/bcbboost/boost/spirit/home/phoenix/core/detail/function_eval.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -32,7 +32,11 @@
template <typename Env, typename F>
struct result
{
- typedef typename F::template result<Env>::type fn;
+ typedef typename
+ remove_reference<
+ typename F::template result<Env>::type
+ >::type
+ fn;
typedef typename fn::result_type type;
};
@@ -96,7 +100,11 @@
, BOOST_PP_ENUM_PARAMS(N, typename A)>
struct result
{
- typedef typename F::template result<Env>::type fn;
+ typedef typename
+ remove_reference<
+ typename F::template result<Env>::type
+ >::type
+ fn;
BOOST_PP_REPEAT(N, PHOENIX_GET_ARG, _)
typedef BOOST_PP_CAT(mpl::vector, N)
Modified: branches/bcbboost/boost/spirit/home/phoenix/scope/detail/local_gen.hpp
==============================================================================
--- branches/bcbboost/boost/spirit/home/phoenix/scope/detail/local_gen.hpp (original)
+++ branches/bcbboost/boost/spirit/home/phoenix/scope/detail/local_gen.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -5,8 +5,7 @@
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#ifndef BOOST_PP_IS_ITERATING
-#ifndef PHOENIX_SCOPE_DETAIL_LOCAL_GEN_HPP
-#define PHOENIX_SCOPE_DETAIL_LOCAL_GEN_HPP
+// Allow multiple inclusion. let.hpp and lambda.hpp will have the guards
#include <boost/preprocessor/iterate.hpp>
#include <boost/preprocessor/repetition/enum.hpp>
@@ -26,7 +25,6 @@
#undef PHOENIX_LOCAL_GEN_PARAM
#undef PHOENIX_LOCAL_GEN_ACTOR
-#endif
///////////////////////////////////////////////////////////////////////////////
//
Modified: branches/bcbboost/boost/spirit/home/phoenix/scope/detail/local_variable.hpp
==============================================================================
--- branches/bcbboost/boost/spirit/home/phoenix/scope/detail/local_variable.hpp (original)
+++ branches/bcbboost/boost/spirit/home/phoenix/scope/detail/local_variable.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -21,7 +21,6 @@
#include <boost/preprocessor/repeat.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <boost/type_traits/is_reference.hpp>
-#include <boost/spirit/home/phoenix/detail/local_reference.hpp>
#define PHOENIX_MAP_LOCAL_TEMPLATE_PARAM(z, n, data) \
typename T##n = unused<n>
@@ -109,35 +108,13 @@
type;
};
- template <typename T>
- struct local_reference_identity
- {
- typedef local_reference<T> type;
- };
-
- template <typename Locals, typename Index>
- struct make_local_reference
- {
- typedef typename
- fusion::result_of::value_at<Locals, Index>::type
- value_at;
-
- typedef typename
- mpl::eval_if<
- is_reference<value_at>
- , mpl::identity<value_at>
- , local_reference_identity<value_at>
- >::type
- type;
- };
-
template <typename Locals, typename Index>
struct get_local_or_void
{
typedef typename
mpl::eval_if<
mpl::less<Index, mpl::size<Locals> >
- , make_local_reference<Locals, Index>
+ , fusion::result_of::at<Locals, Index>
, mpl::identity<fusion::void_>
>::type
type;
Modified: branches/bcbboost/boost/spirit/home/phoenix/scope/local_variable.hpp
==============================================================================
--- branches/bcbboost/boost/spirit/home/phoenix/scope/local_variable.hpp (original)
+++ branches/bcbboost/boost/spirit/home/phoenix/scope/local_variable.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -36,7 +36,7 @@
struct result : detail::apply_local<local_variable<Key>, Env> {};
template <typename Env>
- typename result<Env>::type const
+ typename result<Env>::type
eval(Env const& env) const
{
typedef typename result<Env>::type return_type;
Modified: branches/bcbboost/boost/spirit/home/phoenix/stl/container/container.hpp
==============================================================================
--- branches/bcbboost/boost/spirit/home/phoenix/stl/container/container.hpp (original)
+++ branches/bcbboost/boost/spirit/home/phoenix/stl/container/container.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -268,7 +268,7 @@
typedef
boost::mpl::eval_if<
boost::is_same<Arg1, typename iterator_of<C>::type>
-#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1400)
+#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1500)
, iterator_of<C>
#else
, boost::mpl::identity<void>
Modified: branches/bcbboost/boost/tr1/array.hpp
==============================================================================
--- branches/bcbboost/boost/tr1/array.hpp (original)
+++ branches/bcbboost/boost/tr1/array.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -9,7 +9,12 @@
#ifdef BOOST_HAS_TR1_ARRAY
-# include BOOST_TR1_HEADER(array)
+# ifdef BOOST_HAS_INCLUDE_NEXT
+# include_next BOOST_TR1_HEADER(array)
+# else
+# include <boost/tr1/detail/config_all.hpp>
+# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(array))
+# endif
#else
Modified: branches/bcbboost/boost/tr1/random.hpp
==============================================================================
--- branches/bcbboost/boost/tr1/random.hpp (original)
+++ branches/bcbboost/boost/tr1/random.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -9,7 +9,12 @@
# include <boost/tr1/detail/config.hpp>
#ifdef BOOST_HAS_TR1_RANDOM
-# include BOOST_TR1_HEADER(random)
+# ifdef BOOST_HAS_INCLUDE_NEXT
+# include_next BOOST_TR1_HEADER(random)
+# else
+# include <boost/tr1/detail/config_all.hpp>
+# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(random))
+# endif
#else
// Boost.Random:
#include <boost/random.hpp>
Modified: branches/bcbboost/boost/tr1/regex.hpp
==============================================================================
--- branches/bcbboost/boost/tr1/regex.hpp (original)
+++ branches/bcbboost/boost/tr1/regex.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -9,7 +9,12 @@
#ifdef BOOST_HAS_TR1_REGEX
-# include BOOST_TR1_HEADER(regex)
+# ifdef BOOST_HAS_INCLUDE_NEXT
+# include_next BOOST_TR1_HEADER(regex)
+# else
+# include <boost/tr1/detail/config_all.hpp>
+# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(regex))
+# endif
#else
Modified: branches/bcbboost/boost/tr1/tuple.hpp
==============================================================================
--- branches/bcbboost/boost/tr1/tuple.hpp (original)
+++ branches/bcbboost/boost/tr1/tuple.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -9,7 +9,12 @@
#ifdef BOOST_HAS_TR1_TUPLE
-# include BOOST_TR1_HEADER(tuple)
+# ifdef BOOST_HAS_INCLUDE_NEXT
+# include_next BOOST_TR1_HEADER(tuple)
+# else
+# include <boost/tr1/detail/config_all.hpp>
+# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(tuple))
+# endif
#else
Modified: branches/bcbboost/boost/tr1/type_traits.hpp
==============================================================================
--- branches/bcbboost/boost/tr1/type_traits.hpp (original)
+++ branches/bcbboost/boost/tr1/type_traits.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -8,7 +8,14 @@
# include <boost/tr1/detail/config.hpp>
#ifdef BOOST_HAS_TR1_TYPE_TRAITS
-# include BOOST_TR1_HEADER(type_traits)
+
+# ifdef BOOST_HAS_INCLUDE_NEXT
+# include_next BOOST_TR1_HEADER(type_traits)
+# else
+# include <boost/tr1/detail/config_all.hpp>
+# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(type_traits))
+# endif
+
#else
// Boost Type Traits:
#include <boost/type_traits.hpp>
Modified: branches/bcbboost/boost/tr1/unordered_map.hpp
==============================================================================
--- branches/bcbboost/boost/tr1/unordered_map.hpp (original)
+++ branches/bcbboost/boost/tr1/unordered_map.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -9,7 +9,12 @@
#ifdef BOOST_HAS_TR1_UNORDERED_MAP
-# include BOOST_TR1_HEADER(unordered_map)
+# ifdef BOOST_HAS_INCLUDE_NEXT
+# include_next BOOST_TR1_HEADER(unordered_map)
+# else
+# include <boost/tr1/detail/config_all.hpp>
+# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(unordered_map))
+# endif
#else
Modified: branches/bcbboost/boost/tr1/unordered_set.hpp
==============================================================================
--- branches/bcbboost/boost/tr1/unordered_set.hpp (original)
+++ branches/bcbboost/boost/tr1/unordered_set.hpp 2008-10-05 04:13:29 EDT (Sun, 05 Oct 2008)
@@ -9,7 +9,12 @@
#ifdef BOOST_HAS_TR1_UNORDERED_SET
-# include BOOST_TR1_HEADER(unordered_set)
+# ifdef BOOST_HAS_INCLUDE_NEXT
+# include_next BOOST_TR1_HEADER(unordered_set)
+# else
+# include <boost/tr1/detail/config_all.hpp>
+# include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(unordered_set))
+# endif
#else
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