Mercurial > hg > graal-compiler

comparison src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp @ 18041:52b4284cb496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
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;