diff options
author | kvn <none@none> | 2013-11-05 17:38:04 -0800 |
---|---|---|
committer | kvn <none@none> | 2013-11-05 17:38:04 -0800 |
commit | 448e4a8ada27f95b604d56572b7e061c157e9d8c (patch) | |
tree | e778fc8f1c06b8cb3026363cdadc62db28edb0ca /src/share/vm/libadt | |
parent | 2d51488e378df0299af1d7b786a931129899c81a (diff) | |
parent | 9d58089aaab0379ed221bae24a808871374f626b (diff) | |
download | jdk8u_hotspot-448e4a8ada27f95b604d56572b7e061c157e9d8c.tar.gz |
Merge
Diffstat (limited to 'src/share/vm/libadt')
-rw-r--r-- | src/share/vm/libadt/port.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/share/vm/libadt/port.hpp b/src/share/vm/libadt/port.hpp index 903e486a6..358ab3021 100644 --- a/src/share/vm/libadt/port.hpp +++ b/src/share/vm/libadt/port.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -161,8 +161,8 @@ extern void safe_free (const char *file, unsigned line, void *ptr); extern void *safe_calloc (const char *file, unsigned line, unsigned nitems, unsigned size); extern void *safe_realloc(const char *file, unsigned line, void *ptr, unsigned size); extern char *safe_strdup (const char *file, unsigned line, const char *src); -inline void *operator new( size_t size ) { return malloc(size); } -inline void operator delete( void *ptr ) { free(ptr); } +inline void *operator new( size_t size ) throw() { return malloc(size); } +inline void operator delete( void *ptr ) { free(ptr); } #endif //----------------------------------------------------------------------------- |