comparison src/share/vm/classfile/dictionary.cpp @ 18009:f73af4455d7d

Merge
author asaha
date Thu, 29 May 2014 09:56:06 -0700
parents 78bbf4d43a14
children 52b4284cb496 ce8f6bb717c9
comparison
equal deleted inserted replaced
18008:da65bbf6f89e 18009:f73af4455d7d
28 #include "memory/iterator.hpp" 28 #include "memory/iterator.hpp"
29 #include "oops/oop.inline.hpp" 29 #include "oops/oop.inline.hpp"
30 #include "prims/jvmtiRedefineClassesTrace.hpp" 30 #include "prims/jvmtiRedefineClassesTrace.hpp"
31 #include "utilities/hashtable.inline.hpp" 31 #include "utilities/hashtable.inline.hpp"
32 32
33 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
33 34
34 DictionaryEntry* Dictionary::_current_class_entry = NULL; 35 DictionaryEntry* Dictionary::_current_class_entry = NULL;
35 int Dictionary::_current_class_index = 0; 36 int Dictionary::_current_class_index = 0;
36 37
37 38