Mercurial > hg > graal-compiler

comparison src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp @ 14460:8a9bb7821e28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 19 Feb 2014 12:08:49 -0800
parents e5d78f318aec bdd155477289
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14360:e8ef156f0bc9 14460:8a9bb7821e28
34 #ifdef TARGET_OS_FAMILY_solaris 34 #ifdef TARGET_OS_FAMILY_solaris
35 # include "os_solaris.inline.hpp" 35 # include "os_solaris.inline.hpp"
36 #endif 36 #endif
37 #ifdef TARGET_OS_FAMILY_windows 37 #ifdef TARGET_OS_FAMILY_windows
38 # include "os_windows.inline.hpp" 38 # include "os_windows.inline.hpp"
39 #endif
40 #ifdef TARGET_OS_FAMILY_aix
41 # include "os_aix.inline.hpp"
39 #endif 42 #endif
40 #ifdef TARGET_OS_FAMILY_bsd 43 #ifdef TARGET_OS_FAMILY_bsd
41 # include "os_bsd.inline.hpp" 44 # include "os_bsd.inline.hpp"
42 #endif 45 #endif
43 elapsedTimer CMSAdaptiveSizePolicy::_concurrent_timer; 46 elapsedTimer CMSAdaptiveSizePolicy::_concurrent_timer;