https://svn.boost.org/trac10/ticket/11722 <p> Currently boost::lockfree defines unlikely/unlikely inline functions in branch_hints.hpp. This name is generic and causes conflicts with other (external) libs which also defines likely/unlikely. (linux kernel also defines them the same). boost already has macros defined for this as BOOST_LIKELY/UNLIKELY in boost/config.hpp, and lockfree should use these to avoid conflicts and to be consistent. </p> <p> The following changes were done in boost_1_58_0, and tested to avoid a conflict case. </p> <pre class="wiki">* Comment out the following lines: (not required; those files don’t use likely/unlikely) detail/tagged_ptr_dcas.hpp:#include &lt;boost/lockfree/detail/branch_hints.hpp&gt; detail/tagged_ptr_ptrcompression.hpp:#include &lt;boost/lockfree/detail/branch_hints.hpp&gt; * Replace the following include line with “#include &lt;boost/config.hpp&gt; // for BOOST_LIKELY” spsc_queue.hpp:#include &lt;boost/lockfree/detail/branch_hints.hpp&gt; * Add “#include &lt;boost/config.hpp&gt; // for BOOST_LIKELY” to queue.hpp * Change the following likely/unlikely to BOOST_LIKELY/BOOST_UNLIKELY queue.hpp: using detail::likely; queue.hpp: if (likely(tail == tail2)) { queue.hpp: using detail::likely; queue.hpp: if (likely(head == head2)) { spsc_queue.hpp: while (unlikely(ret &gt;= max_size)) * note that this makes the branch_hints.hpp redundant. </pre> en-us /htdocs/site/boost.png https://svn.boost.org/trac10/ticket/11722 Trac 1.4.3 Sampath Tilakumara <sampath@…> Tue, 13 Oct 2015 13:38:37 GMT https://svn.boost.org/trac10/ticket/11722#comment:4 https://svn.boost.org/trac10/ticket/11722#comment:4 <ul> <li><strong>status</strong> <span class="trac-field-old">new</span> → <span class="trac-field-new">closed</span> </li> <li><strong>resolution</strong> → <span class="trac-field-new">fixed</span> </li> </ul> Ticket