comparison src/share/vm/utilities/debug.hpp @ 11198:1e6d5dec4a4e

Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Aug 2013 13:20:06 +0200
parents 6b0fd0964b87
children 3cce976666d9
comparison
equal deleted inserted replaced
11197:3479ab380552 11198:1e6d5dec4a4e
1 /* 1 /*
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
241 // Support for self-destruct 241 // Support for self-destruct
242 bool is_error_reported(); 242 bool is_error_reported();
243 void set_error_reported(); 243 void set_error_reported();
244 244
245 /* Test assert(), fatal(), guarantee(), etc. */ 245 /* Test assert(), fatal(), guarantee(), etc. */
246 NOT_PRODUCT(void test_error_handler(size_t test_num);) 246 NOT_PRODUCT(void test_error_handler();)
247 247
248 void pd_ps(frame f); 248 void pd_ps(frame f);
249 void pd_obfuscate_location(char *buf, size_t buflen); 249 void pd_obfuscate_location(char *buf, size_t buflen);
250 250
251 #endif // SHARE_VM_UTILITIES_DEBUG_HPP 251 #endif // SHARE_VM_UTILITIES_DEBUG_HPP