Subject: [Boost-commit] svn:boost r79640 - in trunk/boost/phoenix: core scope scope/preprocessed
From: eric_at_[hidden]
Date: 2012-07-21 12:19:08
Author: eric_niebler
Date: 2012-07-21 12:19:07 EDT (Sat, 21 Jul 2012)
New Revision: 79640
URL: http://svn.boost.org/trac/boost/changeset/79640
Log:
qualify calls to phoenix::env to avoid name lookup clashes with proto::env on gcc
Text files modified:
trunk/boost/phoenix/core/meta_grammar.hpp | 4 ++--
trunk/boost/phoenix/scope/lambda.hpp | 2 +-
trunk/boost/phoenix/scope/preprocessed/lambda_10.hpp | 2 +-
trunk/boost/phoenix/scope/preprocessed/lambda_20.hpp | 2 +-
trunk/boost/phoenix/scope/preprocessed/lambda_30.hpp | 2 +-
trunk/boost/phoenix/scope/preprocessed/lambda_40.hpp | 2 +-
trunk/boost/phoenix/scope/preprocessed/lambda_50.hpp | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
Modified: trunk/boost/phoenix/core/meta_grammar.hpp
==============================================================================
--- trunk/boost/phoenix/core/meta_grammar.hpp (original)
+++ trunk/boost/phoenix/core/meta_grammar.hpp 2012-07-21 12:19:07 EDT (Sat, 21 Jul 2012)
@@ -71,7 +71,7 @@
, typename impl::data_param
) const
{
- return what()(e, env(s), actions(s));
+ return what()(e, phoenix::env(s), actions(s));
}
};
@@ -95,7 +95,7 @@
, typename impl::data_param
) const
{
- return what()(e, env(s), actions(s));
+ return what()(e, phoenix::env(s), actions(s));
}
};
};
Modified: trunk/boost/phoenix/scope/lambda.hpp
==============================================================================
--- trunk/boost/phoenix/scope/lambda.hpp (original)
+++ trunk/boost/phoenix/scope/lambda.hpp 2012-07-21 12:19:07 EDT (Sat, 21 Jul 2012)
@@ -309,7 +309,7 @@
return
expression::
lambda<env_type, locals_type, Map, Lambda>::
- make(env(ctx), locals, map, lambda);
+ make(phoenix::env(ctx), locals, map, lambda);
}
};
Modified: trunk/boost/phoenix/scope/preprocessed/lambda_10.hpp
==============================================================================
--- trunk/boost/phoenix/scope/preprocessed/lambda_10.hpp (original)
+++ trunk/boost/phoenix/scope/preprocessed/lambda_10.hpp 2012-07-21 12:19:07 EDT (Sat, 21 Jul 2012)
@@ -252,7 +252,7 @@
return
expression::
lambda<env_type, locals_type, Map, Lambda>::
- make(env(ctx), locals, map, lambda);
+ make(phoenix::env(ctx), locals, map, lambda);
}
};
template <typename Dummy>
Modified: trunk/boost/phoenix/scope/preprocessed/lambda_20.hpp
==============================================================================
--- trunk/boost/phoenix/scope/preprocessed/lambda_20.hpp (original)
+++ trunk/boost/phoenix/scope/preprocessed/lambda_20.hpp 2012-07-21 12:19:07 EDT (Sat, 21 Jul 2012)
@@ -252,7 +252,7 @@
return
expression::
lambda<env_type, locals_type, Map, Lambda>::
- make(env(ctx), locals, map, lambda);
+ make(phoenix::env(ctx), locals, map, lambda);
}
};
template <typename Dummy>
Modified: trunk/boost/phoenix/scope/preprocessed/lambda_30.hpp
==============================================================================
--- trunk/boost/phoenix/scope/preprocessed/lambda_30.hpp (original)
+++ trunk/boost/phoenix/scope/preprocessed/lambda_30.hpp 2012-07-21 12:19:07 EDT (Sat, 21 Jul 2012)
@@ -252,7 +252,7 @@
return
expression::
lambda<env_type, locals_type, Map, Lambda>::
- make(env(ctx), locals, map, lambda);
+ make(phoenix::env(ctx), locals, map, lambda);
}
};
template <typename Dummy>
Modified: trunk/boost/phoenix/scope/preprocessed/lambda_40.hpp
==============================================================================
--- trunk/boost/phoenix/scope/preprocessed/lambda_40.hpp (original)
+++ trunk/boost/phoenix/scope/preprocessed/lambda_40.hpp 2012-07-21 12:19:07 EDT (Sat, 21 Jul 2012)
@@ -252,7 +252,7 @@
return
expression::
lambda<env_type, locals_type, Map, Lambda>::
- make(env(ctx), locals, map, lambda);
+ make(phoenix::env(ctx), locals, map, lambda);
}
};
template <typename Dummy>
Modified: trunk/boost/phoenix/scope/preprocessed/lambda_50.hpp
==============================================================================
--- trunk/boost/phoenix/scope/preprocessed/lambda_50.hpp (original)
+++ trunk/boost/phoenix/scope/preprocessed/lambda_50.hpp 2012-07-21 12:19:07 EDT (Sat, 21 Jul 2012)
@@ -252,7 +252,7 @@
return
expression::
lambda<env_type, locals_type, Map, Lambda>::
- make(env(ctx), locals, map, lambda);
+ make(phoenix::env(ctx), locals, map, lambda);
}
};
template <typename Dummy>