comparison src/share/vm/runtime/globals.hpp @ 4110:03865c41c4f3

Merge
author vladidan
date Tue, 06 Dec 2011 16:35:04 -0500
parents 1bbf5b6fb7b0 cd00eaeebef6
children 81f7362f7bed
comparison
equal deleted inserted replaced
4106:cf4dd13bbcd3 4110:03865c41c4f3
240 240
241 bool is_unlocker() const; 241 bool is_unlocker() const;
242 bool is_unlocked() const; 242 bool is_unlocked() const;
243 bool is_writeable() const; 243 bool is_writeable() const;
244 bool is_external() const; 244 bool is_external() const;
245
246 bool is_unlocker_ext() const;
247 bool is_unlocked_ext() const;
245 248
246 void print_on(outputStream* st, bool withComments = false ); 249 void print_on(outputStream* st, bool withComments = false );
247 void print_as_flag(outputStream* st); 250 void print_as_flag(outputStream* st);
248 }; 251 };
249 252
3920 3923
3921 RUNTIME_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG, DECLARE_LP64_PRODUCT_FLAG) 3924 RUNTIME_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG, DECLARE_LP64_PRODUCT_FLAG)
3922 3925
3923 RUNTIME_OS_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG) 3926 RUNTIME_OS_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_NOTPRODUCT_FLAG)
3924 3927
3928 // Extensions
3929
3930 #include "runtime/globals_ext.hpp"
3931
3925 #endif // SHARE_VM_RUNTIME_GLOBALS_HPP 3932 #endif // SHARE_VM_RUNTIME_GLOBALS_HPP