comparison src/share/vm/utilities/preserveException.hpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents f34d701e952e
children
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
24 24
25 #ifndef SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP 25 #ifndef SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP
26 #define SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP 26 #define SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP
27 27
28 #include "runtime/handles.hpp" 28 #include "runtime/handles.hpp"
29 #ifdef TARGET_OS_FAMILY_linux 29 #include "runtime/thread.inline.hpp"
30 # include "thread_linux.inline.hpp"
31 #endif
32 #ifdef TARGET_OS_FAMILY_solaris
33 # include "thread_solaris.inline.hpp"
34 #endif
35 #ifdef TARGET_OS_FAMILY_windows
36 # include "thread_windows.inline.hpp"
37 #endif
38 #ifdef TARGET_OS_FAMILY_bsd
39 # include "thread_bsd.inline.hpp"
40 #endif
41 30
42 // This file provides more support for exception handling; see also exceptions.hpp 31 // This file provides more support for exception handling; see also exceptions.hpp
43 class PreserveExceptionMark { 32 class PreserveExceptionMark {
44 private: 33 private:
45 Thread* _thread; 34 Thread* _thread;