Changeset 79026


Ignore:
Timestamp:
Jun 21, 2012, 2:15:24 AM (6 years ago)
Author:
Emil Dotchevski
Message:

Merged changes from trunk: dealing with warnings, and a compile error on Win CE.

Location:
branches/release/boost
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/release/boost/exception/detail/error_info_impl.hpp

    r60338 r79026  
    3131            protected:
    3232
     33            virtual
    3334            ~error_info_base() throw()
    3435                {
  • branches/release/boost/exception/detail/exception_ptr.hpp

    r72995 r79026  
    2626#include <new>
    2727#include <ios>
    28 #include <cstdlib>
     28#include <stdlib.h>
    2929
    3030namespace
     
    458458        p.ptr_->rethrow();
    459459        BOOST_ASSERT(0);
    460         std::abort();
     460        #if defined(UNDER_CE)
     461            // some CE platforms don't define ::abort()
     462            exit(-1);
     463        #else
     464            abort();
     465        #endif
    461466        }
    462467
  • branches/release/boost/throw_exception.hpp

    r67128 r79026  
    1 #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED
    2 #define BOOST_THROW_EXCEPTION_HPP_INCLUDED
     1#ifndef UUID_AA15E74A856F11E08B8D93F24824019B
     2#define UUID_AA15E74A856F11E08B8D93F24824019B
     3#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
     4#pragma GCC system_header
     5#endif
     6#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
     7#pragma warning(push,1)
     8#endif
    39
    410// MS compatible compilers support #pragma once
     
    8086                    set_info(
    8187                        set_info(
    82                             boost::enable_error_info(x),
     88                            enable_error_info(x),
    8389                            throw_function(current_function)),
    8490                        throw_file(file)),
     
    8995} // namespace boost
    9096
    91 #endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED
     97#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
     98#pragma warning(pop)
     99#endif
     100#endif
Note: See TracChangeset for help on using the changeset viewer.