|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r57503 - in trunk/boost/spirit/home/phoenix: core scope scope/detail statement
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-08 22:58:28
Author: hkaiser
Date: 2009-11-08 22:58:27 EST (Sun, 08 Nov 2009)
New Revision: 57503
URL: http://svn.boost.org/trac/boost/changeset/57503
Log:
Phoenix: silenced a couple of MSVC warnings created during Spirit test runs
Text files modified:
trunk/boost/spirit/home/phoenix/core/actor.hpp | 4 ++++
trunk/boost/spirit/home/phoenix/core/reference.hpp | 4 ++++
trunk/boost/spirit/home/phoenix/scope/detail/local_variable.hpp | 4 ++++
trunk/boost/spirit/home/phoenix/scope/local_variable.hpp | 8 ++++++--
trunk/boost/spirit/home/phoenix/scope/scoped_environment.hpp | 4 ++++
trunk/boost/spirit/home/phoenix/statement/if.hpp | 8 ++++++++
6 files changed, 30 insertions(+), 2 deletions(-)
Modified: trunk/boost/spirit/home/phoenix/core/actor.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/core/actor.hpp (original)
+++ trunk/boost/spirit/home/phoenix/core/actor.hpp 2009-11-08 22:58:27 EST (Sun, 08 Nov 2009)
@@ -137,6 +137,10 @@
// Bring in the rest of the constructors and function call operators
#include <boost/spirit/home/phoenix/core/detail/actor.hpp>
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ actor& operator= (actor const&);
};
// Forward declaration: The intent to overload the comma must be
Modified: trunk/boost/spirit/home/phoenix/core/reference.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/core/reference.hpp (original)
+++ trunk/boost/spirit/home/phoenix/core/reference.hpp 2009-11-08 22:58:27 EST (Sun, 08 Nov 2009)
@@ -39,6 +39,10 @@
}
T& ref;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ reference& operator= (reference const&);
};
template <typename T>
Modified: trunk/boost/spirit/home/phoenix/scope/detail/local_variable.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/scope/detail/local_variable.hpp (original)
+++ trunk/boost/spirit/home/phoenix/scope/detail/local_variable.hpp 2009-11-08 22:58:27 EST (Sun, 08 Nov 2009)
@@ -60,6 +60,10 @@
}
Env const& env;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ initialize_local& operator= (initialize_local const&);
};
template <typename T>
Modified: trunk/boost/spirit/home/phoenix/scope/local_variable.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/scope/local_variable.hpp (original)
+++ trunk/boost/spirit/home/phoenix/scope/local_variable.hpp 2009-11-08 22:58:27 EST (Sun, 08 Nov 2009)
@@ -20,14 +20,14 @@
struct local_variable
{
typedef Key key_type;
-
+
// This will prevent actor::operator()() from kicking in.
// Actually, we do not need all actor::operator()s for
// all arities, but this will suffice. The nullary
// actor::operator() is particularly troublesome because
// it is always eagerly evaluated by the compiler.
typedef mpl::true_ no_nullary;
-
+
template <typename Env>
struct result : detail::apply_local<local_variable<Key>, Env> {};
@@ -45,6 +45,10 @@
env
, index_type());
}
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ local_variable& operator= (local_variable const&);
};
namespace local_names
Modified: trunk/boost/spirit/home/phoenix/scope/scoped_environment.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/scope/scoped_environment.hpp (original)
+++ trunk/boost/spirit/home/phoenix/scope/scoped_environment.hpp 2009-11-08 22:58:27 EST (Sun, 08 Nov 2009)
@@ -37,6 +37,10 @@
Env const& env;
OuterEnv const& outer_env;
Locals& locals;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ scoped_environment& operator= (scoped_environment const&);
};
}}
Modified: trunk/boost/spirit/home/phoenix/statement/if.hpp
==============================================================================
--- trunk/boost/spirit/home/phoenix/statement/if.hpp (original)
+++ trunk/boost/spirit/home/phoenix/statement/if.hpp 2009-11-08 22:58:27 EST (Sun, 08 Nov 2009)
@@ -77,6 +77,10 @@
}
if_composite<Cond, Then> const& source;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ else_gen& operator= (else_gen const&);
};
template <typename Cond, typename Then>
@@ -87,6 +91,10 @@
, else_(*this) {}
else_gen<Cond, Then> else_;
+
+ private:
+ // silence MSVC warning C4512: assignment operator could not be generated
+ if_composite& operator= (if_composite const&);
};
template <typename Cond>
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