Update of /cvsroot/boost/boost/boost/xpressive/proto
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29670
Modified Files:
domain.hpp generate.hpp proto_fwd.hpp
Log Message:
more adl barriers
Index: domain.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/domain.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- domain.hpp 29 Jun 2007 07:49:33 -0000 1.7
+++ domain.hpp 6 Jul 2007 02:55:54 -0000 1.8
@@ -28,24 +28,27 @@
{};
}
- template<typename Generator, typename Grammar>
- struct domain
- : Generator
+ namespace domainns_
{
- typedef Grammar grammar;
+ template<typename Generator, typename Grammar>
+ struct domain
+ : Generator
+ {
+ typedef Grammar grammar;
- /// INTERNAL ONLY
- ///
- typedef void proto_is_domain_;
- };
+ /// INTERNAL ONLY
+ ///
+ typedef void proto_is_domain_;
+ };
- struct default_domain
- : domain<>
- {};
+ struct default_domain
+ : domain<>
+ {};
- struct deduce_domain
- : domain<detail::not_a_generator, detail::not_a_grammar>
- {};
+ struct deduce_domain
+ : domain<detail::not_a_generator, detail::not_a_grammar>
+ {};
+ }
template<typename T, typename EnableIf>
struct is_domain
Index: generate.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/generate.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- generate.hpp 26 May 2007 03:31:42 -0000 1.5
+++ generate.hpp 6 Jul 2007 02:55:54 -0000 1.6
@@ -19,53 +19,56 @@
namespace boost { namespace proto
{
- struct default_generator
+ namespace generatorns_
{
- template<typename Expr>
- struct apply
+ struct default_generator
{
- typedef Expr type;
- };
+ template<typename Expr>
+ struct apply
+ {
+ typedef Expr type;
+ };
- template<typename Expr>
- static Expr const &make(Expr const &expr)
- {
- return expr;
+ template<typename Expr>
+ static Expr const &make(Expr const &expr)
+ {
+ return expr;
+ };
};
- };
- template<template<typename> class Extends>
- struct generator
- {
- template<typename Expr>
- struct apply
+ template<template<typename> class Extends>
+ struct generator
{
- typedef Extends<Expr> type;
+ template<typename Expr>
+ struct apply
+ {
+ typedef Extends<Expr> type;
+ };
+
+ template<typename Expr>
+ static Extends<Expr> make(Expr const &expr)
+ {
+ return Extends<Expr>(expr);
+ }
};
- template<typename Expr>
- static Extends<Expr> make(Expr const &expr)
+ template<template<typename> class Extends>
+ struct pod_generator
{
- return Extends<Expr>(expr);
- }
- };
+ template<typename Expr>
+ struct apply
+ {
+ typedef Extends<Expr> type;
+ };
- template<template<typename> class Extends>
- struct pod_generator
- {
- template<typename Expr>
- struct apply
- {
- typedef Extends<Expr> type;
+ template<typename Expr>
+ static Extends<Expr> make(Expr const &expr)
+ {
+ Extends<Expr> that = {expr};
+ return that;
+ }
};
-
- template<typename Expr>
- static Extends<Expr> make(Expr const &expr)
- {
- Extends<Expr> that = {expr};
- return that;
- }
- };
+ }
namespace detail
{
Index: proto_fwd.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/proto_fwd.hpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- proto_fwd.hpp 4 Jul 2007 21:40:17 -0000 1.84
+++ proto_fwd.hpp 6 Jul 2007 02:55:54 -0000 1.85
@@ -123,20 +123,34 @@
using wildcardns_::_;
- struct default_generator;
+ namespace generatorns_
+ {
+ struct default_generator;
- template<template<typename> class Extends>
- struct generator;
+ template<template<typename> class Extends>
+ struct generator;
- template<template<typename> class Extends>
- struct pod_generator;
+ template<template<typename> class Extends>
+ struct pod_generator;
+ }
- template<typename Generator = default_generator, typename Grammar =
proto::_>
- struct domain;
+ using generatorns_::default_generator;
+ using generatorns_::generator;
+ using generatorns_::pod_generator;
- struct default_domain;
+ namespace domainns_
+ {
+ template<typename Generator = default_generator, typename Grammar =
proto::_>
+ struct domain;
- struct deduce_domain;
+ struct default_domain;
+
+ struct deduce_domain;
+ }
+
+ using domainns_::domain;
+ using domainns_::default_domain;
+ using domainns_::deduce_domain;
namespace ops
{
@@ -475,10 +489,15 @@
typedef Expr_ type;\
}
- struct has_identity_transform
+ namespace identitytfxns_
{
- BOOST_PROTO_IDENTITY_TRANSFORM();
- };
+ struct has_identity_transform
+ {
+ BOOST_PROTO_IDENTITY_TRANSFORM();
+ };
+ }
+
+ using identitytfxns_::has_identity_transform;
template<typename Grammar>
struct has_pass_through_transform;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
