comparison src/share/vm/includeDB_core @ 1316:cc98cc548f51

Merge
author apetrusenko
date Mon, 22 Mar 2010 02:40:53 -0700
parents 9eba43136cb5 2a1472c30599
children 4a9cc99938e3
comparison
equal deleted inserted replaced
1306:6c94fe3c8df3 1316:cc98cc548f51
2724 markOop.inline.hpp klassOop.hpp 2724 markOop.inline.hpp klassOop.hpp
2725 markOop.inline.hpp markOop.hpp 2725 markOop.inline.hpp markOop.hpp
2726 2726
2727 markSweep.cpp compileBroker.hpp 2727 markSweep.cpp compileBroker.hpp
2728 markSweep.cpp methodDataOop.hpp 2728 markSweep.cpp methodDataOop.hpp
2729 markSweep.cpp objArrayKlass.inline.hpp
2729 2730
2730 markSweep.hpp collectedHeap.hpp 2731 markSweep.hpp collectedHeap.hpp
2732 markSweep.hpp taskqueue.hpp
2731 2733
2732 memRegion.cpp globals.hpp 2734 memRegion.cpp globals.hpp
2733 memRegion.cpp memRegion.hpp 2735 memRegion.cpp memRegion.hpp
2734 2736
2735 memRegion.hpp allocation.hpp 2737 memRegion.hpp allocation.hpp
3055 objArrayKlass.cpp collectedHeap.inline.hpp 3057 objArrayKlass.cpp collectedHeap.inline.hpp
3056 objArrayKlass.cpp copy.hpp 3058 objArrayKlass.cpp copy.hpp
3057 objArrayKlass.cpp genOopClosures.inline.hpp 3059 objArrayKlass.cpp genOopClosures.inline.hpp
3058 objArrayKlass.cpp handles.inline.hpp 3060 objArrayKlass.cpp handles.inline.hpp
3059 objArrayKlass.cpp instanceKlass.hpp 3061 objArrayKlass.cpp instanceKlass.hpp
3062 objArrayKlass.cpp markSweep.inline.hpp
3060 objArrayKlass.cpp mutexLocker.hpp 3063 objArrayKlass.cpp mutexLocker.hpp
3061 objArrayKlass.cpp objArrayKlass.hpp 3064 objArrayKlass.cpp objArrayKlass.hpp
3065 objArrayKlass.cpp objArrayKlass.inline.hpp
3062 objArrayKlass.cpp objArrayKlassKlass.hpp 3066 objArrayKlass.cpp objArrayKlassKlass.hpp
3063 objArrayKlass.cpp objArrayOop.hpp 3067 objArrayKlass.cpp objArrayOop.hpp
3064 objArrayKlass.cpp oop.inline.hpp 3068 objArrayKlass.cpp oop.inline.hpp
3065 objArrayKlass.cpp oop.inline2.hpp 3069 objArrayKlass.cpp oop.inline2.hpp
3066 objArrayKlass.cpp resourceArea.hpp 3070 objArrayKlass.cpp resourceArea.hpp
3067 objArrayKlass.cpp symbolOop.hpp 3071 objArrayKlass.cpp symbolOop.hpp
3068 objArrayKlass.cpp systemDictionary.hpp 3072 objArrayKlass.cpp systemDictionary.hpp
3069 objArrayKlass.cpp universe.inline.hpp 3073 objArrayKlass.cpp universe.inline.hpp
3070 objArrayKlass.cpp vmSymbols.hpp 3074 objArrayKlass.cpp vmSymbols.hpp
3071 3075
3072
3073 objArrayKlass.hpp arrayKlass.hpp 3076 objArrayKlass.hpp arrayKlass.hpp
3074 objArrayKlass.hpp instanceKlass.hpp 3077 objArrayKlass.hpp instanceKlass.hpp
3075 objArrayKlass.hpp specialized_oop_closures.hpp 3078 objArrayKlass.hpp specialized_oop_closures.hpp
3079
3080 objArrayKlass.inline.hpp objArrayKlass.hpp
3076 3081
3077 objArrayKlassKlass.cpp collectedHeap.inline.hpp 3082 objArrayKlassKlass.cpp collectedHeap.inline.hpp
3078 objArrayKlassKlass.cpp instanceKlass.hpp 3083 objArrayKlassKlass.cpp instanceKlass.hpp
3079 objArrayKlassKlass.cpp javaClasses.hpp 3084 objArrayKlassKlass.cpp javaClasses.hpp
3080 objArrayKlassKlass.cpp markSweep.inline.hpp 3085 objArrayKlassKlass.cpp markSweep.inline.hpp
4097 task.cpp timer.hpp 4102 task.cpp timer.hpp
4098 4103
4099 task.hpp top.hpp 4104 task.hpp top.hpp
4100 4105
4101 taskqueue.cpp debug.hpp 4106 taskqueue.cpp debug.hpp
4107 taskqueue.cpp oop.inline.hpp
4102 taskqueue.cpp os.hpp 4108 taskqueue.cpp os.hpp
4103 taskqueue.cpp taskqueue.hpp 4109 taskqueue.cpp taskqueue.hpp
4104 taskqueue.cpp thread_<os_family>.inline.hpp 4110 taskqueue.cpp thread_<os_family>.inline.hpp
4105 4111
4106 taskqueue.hpp allocation.hpp 4112 taskqueue.hpp allocation.hpp