Merging changes from trunk.

[SVN r58421]
This commit is contained in:
Emil Dotchevski
2009-12-16 22:26:57 +00:00
committed by Peter Dimov
parent bee54c1aee
commit fed2b48aa9
4 changed files with 53 additions and 26 deletions

View File

@ -6,9 +6,7 @@
#ifndef UUID_61531AB0680611DEADD5846855D89593
#define UUID_61531AB0680611DEADD5846855D89593
#include <boost/config.hpp>
#if defined(BOOST_MSVC)
#if defined(_MSC_VER)
#define BOOST_ATTRIBUTE_NORETURN __declspec(noreturn)
#elif defined(__GNUC__)
#define BOOST_ATTRIBUTE_NORETURN __attribute__((noreturn))