Mercurial > hg > truffle
diff src/share/vm/ci/ciUtilities.hpp @ 11198:1e6d5dec4a4e
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 05 Aug 2013 13:20:06 +0200 |
parents | 6b0fd0964b87 |
children | d8041d695d19 |
line wrap: on
line diff
--- a/src/share/vm/ci/ciUtilities.hpp Thu Aug 01 21:34:57 2013 +0200 +++ b/src/share/vm/ci/ciUtilities.hpp Mon Aug 05 13:20:06 2013 +0200 @@ -96,7 +96,7 @@ CLEAR_PENDING_EXCEPTION; \ return (result); \ } \ - (0 + (void)(0 #define KILL_COMPILE_ON_ANY \ THREAD); \ @@ -104,7 +104,7 @@ fatal("unhandled ci exception"); \ CLEAR_PENDING_EXCEPTION; \ } \ -(0 +(void)(0 inline const char* bool_to_str(bool b) {