Mercurial > hg > truffle

diff src/share/vm/classfile/classFileParser.hpp @ 18009:f73af4455d7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 29 May 2014 09:56:06 -0700
parents f0d759a6a230 78bbf4d43a14
children 90257dfad6e3
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.hpp	Wed May 28 12:07:21 2014 -0700
+++ b/src/share/vm/classfile/classFileParser.hpp	Thu May 29 09:56:06 2014 -0700
@@ -313,7 +313,9 @@
     if (!b) { classfile_parse_error(msg, CHECK); }
   }
 
-  inline void assert_property(bool b, const char* msg, TRAPS) {
+PRAGMA_DIAG_PUSH
+PRAGMA_FORMAT_NONLITERAL_IGNORED
+inline void assert_property(bool b, const char* msg, TRAPS) {
 #ifdef ASSERT
     if (!b) {
       ResourceMark rm(THREAD);
@@ -330,6 +332,7 @@
     }
 #endif
   }
+PRAGMA_DIAG_POP
 
   inline void check_property(bool property, const char* msg, int index, TRAPS) {
     if (_need_verify) {