[Boost-commit] svn:boost r85550 - in branches/release: . boost boost/phoenix/function

Subject: [Boost-commit] svn:boost r85550 - in branches/release: . boost boost/phoenix/function
From: eric_at_[hidden]
Date: 2013-09-03 13:47:13

Author: eric_niebler
Date: 2013-09-03 13:47:12 EDT (Tue, 03 Sep 2013)
New Revision: 85550
URL: http://svn.boost.org/trac/boost/changeset/85550

Log:
merge [85488] from trunk, fixes #9049

Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
Text files modified: 
   branches/release/boost/phoenix/function/function.hpp |     7 +++++--                                 
   1 files changed, 5 insertions(+), 2 deletions(-)

Modified: branches/release/boost/phoenix/function/function.hpp
==============================================================================
--- branches/release/boost/phoenix/function/function.hpp	Mon Sep  2 17:34:34 2013	(r85549)
+++ branches/release/boost/phoenix/function/function.hpp	2013-09-03 13:47:12 EDT (Tue, 03 Sep 2013)	(r85550)
@@ -8,6 +8,7 @@
 #ifndef BOOST_PHOENIX_FUNCTION_FUNCTION_HPP
 #define BOOST_PHOENIX_FUNCTION_FUNCTION_HPP
 
+#include <boost/config.hpp>
 //#include <boost/phoenix/function/function_handling.hpp>
 #include <boost/phoenix/core/detail/function_eval.hpp>
 #include <boost/preprocessor/facilities/expand.hpp>
@@ -24,9 +25,11 @@
     template<typename F>
     struct function
     {
-        function() {}
+        BOOST_CONSTEXPR function()
+          : f()
+        {}
 
-        function(F f)
+        BOOST_CONSTEXPR function(F f)
           : f(f)
         {}