feedc0de/boost_function
1
0
Fork 0
forked from boostorg/function
Code Pull Requests Activity

Merged revisions 41776-41815 via svnmerge from

Browse Source 
https://svn.boost.org/svn/boost/trunk

........
  r41778 | bgubenko | 2007-12-06 02:47:52 -0800 (Thu, 06 Dec 2007) | 1 line
  
  compute 'result' in to_ulong() as it is done in Boost 1.34
........
  r41788 | vladimir_prus | 2007-12-06 08:00:38 -0800 (Thu, 06 Dec 2007) | 2 lines
  
  Add Google Analytics tracking code for the uploaded docs.
........
  r41789 | vladimir_prus | 2007-12-06 08:12:01 -0800 (Thu, 06 Dec 2007) | 3 lines
  
  Fix search for html files. Put packages where
  beta.boost.org can fetch them.
........
  r41791 | vladimir_prus | 2007-12-06 08:23:39 -0800 (Thu, 06 Dec 2007) | 1 line
  
  Fix quoting
........
  r41795 | dgregor | 2007-12-06 09:17:38 -0800 (Thu, 06 Dec 2007) | 4 lines
  
  Bump VC++ version check to continue applying VC-specific workaround for
  Visual C++ 9.0. Fixes #1499
........
  r41798 | dgregor | 2007-12-06 10:39:06 -0800 (Thu, 06 Dec 2007) | 3 lines
  
  Disable more Visual C++ warnings in Function headers. Fixes #1416
........
  r41801 | guwi17 | 2007-12-06 11:21:31 -0800 (Thu, 06 Dec 2007) | 3 lines
  
  - fix and close #1502 
  - the return types were not correct: there was A instead of indirect_array<A>
........
  r41802 | dgregor | 2007-12-06 11:22:06 -0800 (Thu, 06 Dec 2007) | 4 lines
  
  Workaround for MPICH to properly deal with SEEK_* constants.
  Fixes #1486
........
  r41805 | t_schwinger | 2007-12-06 13:25:10 -0800 (Thu, 06 Dec 2007) | 3 lines
  
  annotates on msvc 7.1 overload selection bug in function_types example
........


[SVN r41915]
This commit is contained in:
Eric Niebler
2007-12-09 02:38:15 +00:00
parent b989eee675
commit 11a2db3e2c
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/boost/function/function_base.hpp
View File

@ -33,6 +33,7 @@
#if defined(BOOST_MSVC)
# pragma warning( push )
# pragma warning( disable : 4793 ) // complaint about native code generation
# pragma warning( disable : 4127 ) // "conditional expression is constant"
#endif
// Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.

9
include/boost/function/function_template.hpp
View File

@ -11,6 +11,11 @@
// protection.
#include <boost/function/detail/prologue.hpp>
#if defined(BOOST_MSVC)
# pragma warning( push )
# pragma warning( disable : 4127 ) // "conditional expression is constant"
#endif
#define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
#define BOOST_FUNCTION_TEMPLATE_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, T)
@ -958,3 +963,7 @@ public:
#undef BOOST_FUNCTION_ARG_TYPES
#undef BOOST_FUNCTION_VOID_RETURN_TYPE
#undef BOOST_FUNCTION_RETURN
#if defined(BOOST_MSVC)
# pragma warning( pop )
#endif