Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r74917 - in trunk: boost/config libs/config/doc libs/config/doc/html libs/config/doc/html/boost_config libs/config/test
From: john_at_[hidden]
Date: 2011-10-11 13:24:26

Next message: john_at_[hidden]: "[Boost-commit] svn:boost r74918 - in trunk: boost/math/special_functions libs/math/test"
Previous message: marshall_at_[hidden]: "[Boost-commit] svn:boost r74916 - trunk/boost/function"

Author: johnmaddock
Date: 2011-10-11 13:24:22 EDT (Tue, 11 Oct 2011)
New Revision: 74917
URL: http://svn.boost.org/trac/boost/changeset/74917

Log:
Apply BOOST_FORCE_INLINE patch.
Regenerate docs.
Text files modified:
   trunk/boost/config/suffix.hpp | 12 +++++
   trunk/libs/config/doc/html/boost_config/acknowledgements.html | 2
   trunk/libs/config/doc/html/boost_config/boost_macro_reference.html | 81 +++++++++++++++++++++++++++++----------
   trunk/libs/config/doc/html/boost_config/guidelines_for_boost_authors.html | 2
   trunk/libs/config/doc/html/boost_config/rationale.html | 2
   trunk/libs/config/doc/html/index.html | 8 +-
   trunk/libs/config/doc/macro_reference.qbk | 20 +++++++++
   trunk/libs/config/test/config_info.cpp | 2
   8 files changed, 101 insertions(+), 28 deletions(-)

Modified: trunk/boost/config/suffix.hpp
==============================================================================
--- trunk/boost/config/suffix.hpp (original)
+++ trunk/boost/config/suffix.hpp 2011-10-11 13:24:22 EDT (Tue, 11 Oct 2011)
@@ -688,5 +688,17 @@

#define BOOST_STATIC_CONSTEXPR static BOOST_CONSTEXPR_OR_CONST

+// BOOST_FORCEINLINE ---------------------------------------------//
+// Macro to use in place of 'inline' to force a function to be inline
+#if !defined(BOOST_FORCEINLINE)
+# if defined(_MSC_VER)
+# define BOOST_FORCEINLINE __forceinline
+# elif defined(__GNUC__) && __GNUC__ > 3
+# define BOOST_FORCEINLINE inline __attribute__ ((always_inline))
+# else
+# define BOOST_FORCEINLINE inline
+# endif
+#endif
+
#endif

Modified: trunk/libs/config/doc/html/boost_config/acknowledgements.html
==============================================================================
--- trunk/libs/config/doc/html/boost_config/acknowledgements.html (original)
+++ trunk/libs/config/doc/html/boost_config/acknowledgements.html 2011-10-11 13:24:22 EDT (Tue, 11 Oct 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Acknowledgements</title>
<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Boost.Config">
<link rel="up" href="../index.html" title="Boost.Config">
<link rel="prev" href="rationale.html" title="Rationale">

Modified: trunk/libs/config/doc/html/boost_config/boost_macro_reference.html
==============================================================================
--- trunk/libs/config/doc/html/boost_config/boost_macro_reference.html (original)
+++ trunk/libs/config/doc/html/boost_config/boost_macro_reference.html 2011-10-11 13:24:22 EDT (Tue, 11 Oct 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Boost Macro Reference</title>
<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Boost.Config">
<link rel="up" href="../index.html" title="Boost.Config">
<link rel="prev" href="../index.html" title="Boost.Config">
@@ -315,7 +315,7 @@
<td>
 
 The compiler fails to compile a nested class that has a dependent
- base class:
+ base class:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">template<typename T>
struct foo : {
@@ -341,8 +341,9 @@
<td>
 
 Template value parameters cannot have a dependent type, for example:
+

-<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">template<class T, typename T::type value>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">template<class T, typename T::type value>
class X { ... };
</pre>

@@ -421,7 +422,7 @@
<td>
 
 The compiler does not perform function template ordering or its
- function template ordering is incorrect.
+ function template ordering is incorrect.

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">// #1
template<class T> void f(T);
@@ -1313,7 +1314,7 @@
<td>
 
 The compiler does not allow a void function to return the result
- of calling another void function.
+ of calling another void function.

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">void f() {}
void g() { return f(); }
@@ -2917,12 +2918,12 @@
 
 Some compilers don't support the use of <code class="computeroutput">constexpr</code>.
 This macro expands to nothing on those compilers, and <code class="computeroutput">constexpr</code> elsewhere. For example,
- when defining a constexpr function or constructor replace:
+ when defining a constexpr function or constructor replace:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">constexpr tuple();
</pre>

- with:
+ with:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">BOOST_CONSTEXPR tuple();
</pre>
@@ -2942,11 +2943,12 @@
 This macro expands to <code class="computeroutput">const</code>
 on those compilers, and <code class="computeroutput">constexpr</code>
 elsewhere. For example, when defining const expr variables replace:
+

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">static constexpr UIntType xor_mask = a;
</pre>

- with:
+ with:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">static BOOST_CONSTEXPR_OR_CONST UIntType xor_mask = a;
</pre>
@@ -2964,12 +2966,12 @@
 
 This is a shortcut for <code class="computeroutput">static
 BOOST_CONSTEXPR_OR_CONST</code>For
- example, when defining const expr variables replace:
+ example, when defining const expr variables replace:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">static constexpr UIntType xor_mask = a;
</pre>

- with:
+ with:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">BOOST_STATIC_CONSTEXPR UIntType xor_mask = a;
</pre>
@@ -2980,6 +2982,7 @@
<tr>
<td>
 
+

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">BOOST_NOEXCEPT
BOOST_NOEXCEPT_IF(Predicate)
@@ -2996,6 +2999,7 @@
 
 <div class="blockquote"><blockquote class="blockquote">

+

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">#define BOOST_NOEXCEPT
#define BOOST_NOEXCEPT_IF(Predicate)
@@ -3011,6 +3015,7 @@
 
 <div class="blockquote"><blockquote class="blockquote">

+

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">#define BOOST_NOEXCEPT noexcept
#define BOOST_NOEXCEPT_IF(Predicate) noexcept((Predicate))
@@ -3061,12 +3066,12 @@
 
 This macro is used where a compiler specific workaround is required
 that is not otherwise described by one of the other Boost.Config
- macros. To use the macro you must first
+ macros. To use the macro you must first

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">#include <boost/detail/workaround.hpp>
</pre>

- usage is then:
+ usage is then:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">#if BOOST_WORKAROUND(MACRONAME, CONDITION)
 // workaround code goes here...
@@ -3109,12 +3114,12 @@
 Sometimes you have a function name with the same name as a C macro,
 for example "min" and "max" member functions,
 in which case one can prevent the function being expanded as a
- macro using:
+ macro using:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">someclass.min BOOST_PREVENT_MACRO_SUBSTITUTION(arg1, arg2);
</pre>

- The following also works in most, but not all, contexts:
+ The following also works in most, but not all, contexts:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">(someclass.max)(arg1, arg2);
</pre>
@@ -3209,14 +3214,14 @@
 integral constant members, we must use enums as a workaround if
 we want the constants to be available at compile-time. This macro
 gives us a convenient way to declare such constants. For example
- instead of:
+ instead of:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">struct foo{
 static const int value = 2;
};
</pre>

- use:
+ use:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">struct foo{
 BOOST_STATIC_CONSTANT(int, value = 2);
@@ -3249,7 +3254,7 @@
 
 Some compilers silently "fold" different function template
 instantiations if some of the template parameters don't appear
- in the function parameter list. For instance:
+ in the function parameter list. For instance:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">#include <iostream>
#include <ostream>
@@ -3273,7 +3278,7 @@
 incorrectly outputs <code class="literal">2 2 double double</code> on VC++
 6. These macros, to be used in the function parameter list, fix
 the problem without effects on the calling syntax. For instance,
- in the case above write:
+ in the case above write:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">template <int n>
void f(BOOST_EXPLICIT_TEMPLATE_NON_TYPE(int, n)) { ... }
@@ -3383,6 +3388,40 @@
 
 </td>
</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">BOOST_FORCEINLINE</code>
+ 
+ </td>
+<td>
+ 
+ This macro can be used in place of the <code class="computeroutput">inline</code>
+ keyword to instruct the compiler that a function should always
+ be inlined. Overuse of this macro can lead to significant bloat,
+ while good use can increase performance in certain cases, such
+ as computation-intensive code built through generative programming
+ techniques.
+ 
+ 
+ Usage example:
+
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">template<class T>
+BOOST_FORCEINLINE T& f(T& t)
+{
+ return t;
+}
+</pre>
+
+ 
+ 
+ Note that use of this macro can lead to cryptic error messages
+ with some compilers. Consider defining it to <code class="computeroutput">inline</code>
+ before including the Boost.Config header in order to be able to
+ debug errors more easily.
+ 
+ </td>
+</tr>
</tbody>
</table></div>
</div>
@@ -3783,7 +3822,7 @@
 RTTI. Examples include class for objects that will be thrown
 as exceptions or used in dynamic_casts, across shared library
 boundaries. For example, a header-only exception class might
- look like this:
+ look like this:

<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">class BOOST_SYMBOL_VISIBLE my_exception : public std::runtime_error { ... };
</pre>
@@ -3821,7 +3860,7 @@
#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_FOO_DYN_LINK)
# if defined(BOOST_FOO_SOURCE)
# define BOOST_FOO_DECL BOOST_SYMBOL_EXPORT
-# else
+# else
# define BOOST_FOO_DECL BOOST_SYMBOL_IMPORT
# endif
#else
@@ -3843,7 +3882,7 @@
 boost/libs/foo/src/foo.cpp
 
<pre class="programlisting">#define BOOST_FOO_SOURCE
-#include <boost/foo/foo.hpp>
+#include <boost/foo/foo.hpp>
...
void BOOST_FOO_DECL f()
{

Modified: trunk/libs/config/doc/html/boost_config/guidelines_for_boost_authors.html
==============================================================================
--- trunk/libs/config/doc/html/boost_config/guidelines_for_boost_authors.html (original)
+++ trunk/libs/config/doc/html/boost_config/guidelines_for_boost_authors.html 2011-10-11 13:24:22 EDT (Tue, 11 Oct 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Guidelines for Boost Authors</title>
<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Boost.Config">
<link rel="up" href="../index.html" title="Boost.Config">
<link rel="prev" href="boost_macro_reference.html" title="Boost Macro Reference">

Modified: trunk/libs/config/doc/html/boost_config/rationale.html
==============================================================================
--- trunk/libs/config/doc/html/boost_config/rationale.html (original)
+++ trunk/libs/config/doc/html/boost_config/rationale.html 2011-10-11 13:24:22 EDT (Tue, 11 Oct 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Rationale</title>
<link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="../index.html" title="Boost.Config">
<link rel="up" href="../index.html" title="Boost.Config">
<link rel="prev" href="guidelines_for_boost_authors.html" title="Guidelines for Boost Authors">

Modified: trunk/libs/config/doc/html/index.html
==============================================================================
--- trunk/libs/config/doc/html/index.html (original)
+++ trunk/libs/config/doc/html/index.html 2011-10-11 13:24:22 EDT (Tue, 11 Oct 2011)
@@ -3,7 +3,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Boost.Config</title>
<link rel="stylesheet" href="../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="Boost.Config">
<link rel="next" href="boost_config/boost_macro_reference.html" title="Boost Macro Reference">
</head>
@@ -29,7 +29,7 @@
<div>Copyright © 2001-2007 Beman Dawes, Vesa Karvonen, John
 Maddock</div>
<div><div class="legalnotice">
-<a name="config.legal"></a>
+<a name="id988561"></a>
 Distributed under the Boost Software License, Version 1.0. (See accompanying
 file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -277,7 +277,7 @@
export CXXFLAGS="-Aa -DAportable -D__HPACC_THREAD_SAFE_RB_TREE \
 -DRWSTD_MULTI_THREAD -DRW_MULTI_THREAD -D_REENTRANT -D_THREAD_SAFE"
export LDFLAGS="-DAportable"
-export LIBS="-lpthread"
+export LIBS="-lpthread"
sh ./configure
</pre>

@@ -949,7 +949,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: October 10, 2011 at 14:43:27 GMT</td>
+<td align="left">Last revised: October 11, 2011 at 17:21:29 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

Modified: trunk/libs/config/doc/macro_reference.qbk
==============================================================================
--- trunk/libs/config/doc/macro_reference.qbk (original)
+++ trunk/libs/config/doc/macro_reference.qbk 2011-10-11 13:24:22 EDT (Tue, 11 Oct 2011)
@@ -889,6 +889,26 @@
used to create a mangled name in combination with a predefined macro such a
\_\_LINE__.
]]
+[[`BOOST_FORCEINLINE`][
+This macro can be used in place of the `inline` keyword to instruct the compiler
+that a function should always be inlined.
+Overuse of this macro can lead to significant bloat, while good use can increase
+performance in certain cases, such as computation-intensive code built through
+generative programming techniques.
+
+Usage example:
+``
+ template<class T>
+ BOOST_FORCEINLINE T& f(T& t)
+ {
+ return t;
+ }
+``
+
+Note that use of this macro can lead to cryptic error messages with some compilers.
+Consider defining it to `inline` before including the Boost.Config header in order to be
+able to debug errors more easily.
+]]
]

[endsect]

Modified: trunk/libs/config/test/config_info.cpp
==============================================================================
--- trunk/libs/config/test/config_info.cpp (original)
+++ trunk/libs/config/test/config_info.cpp 2011-10-11 13:24:22 EDT (Tue, 11 Oct 2011)
@@ -1111,6 +1111,8 @@
    PRINT_MACRO(BOOST_CONSTEXPR);
    PRINT_MACRO(BOOST_CONSTEXPR_OR_CONST);
    PRINT_MACRO(BOOST_STATIC_CONSTEXPR);
+ PRINT_MACRO(BOOST_NOEXCEPT);
+ PRINT_MACRO(BOOST_FORCEINLINE);
}

void print_separator()

Next message: john_at_[hidden]: "[Boost-commit] svn:boost r74918 - in trunk: boost/math/special_functions libs/math/test"
Previous message: marshall_at_[hidden]: "[Boost-commit] svn:boost r74916 - trunk/boost/function"

Date view	Thread view	Subject view	Author view

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