Mercurial > hg > graal-compiler

comparison src/share/vm/memory/allocation.cpp @ 14456:abec000618bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Tue, 28 Jan 2014 12:25:34 -0800
parents db1ff6781ab4 2b8e28fdf503
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14269:2a8891e0a082 14456:abec000618bf
43 # include "os_solaris.inline.hpp" 43 # include "os_solaris.inline.hpp"
44 #endif 44 #endif
45 #ifdef TARGET_OS_FAMILY_windows 45 #ifdef TARGET_OS_FAMILY_windows
46 # include "os_windows.inline.hpp" 46 # include "os_windows.inline.hpp"
47 #endif 47 #endif
48 #ifdef TARGET_OS_FAMILY_aix
49 # include "os_aix.inline.hpp"
50 #endif
48 #ifdef TARGET_OS_FAMILY_bsd 51 #ifdef TARGET_OS_FAMILY_bsd
49 # include "os_bsd.inline.hpp" 52 # include "os_bsd.inline.hpp"
50 #endif 53 #endif
51 54
52 void* StackObj::operator new(size_t size) throw() { ShouldNotCallThis(); return 0; } 55 void* StackObj::operator new(size_t size) throw() { ShouldNotCallThis(); return 0; }