8141134: Remove unnecessary pragma warning(disable:4355) from GC code

Reviewed-by: ehelin, simonis, stuefe
This commit is contained in:
Thomas Schatzl 2015-11-04 17:36:29 +01:00
parent 7ac4628585
commit a6231d3f70
7 changed files with 3 additions and 40 deletions

View File

@ -680,10 +680,6 @@ nmethod* nmethod::new_nmethod(const methodHandle& method,
return nm;
}
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4355) // warning C4355: 'this' : used in base member initializer list
#endif
// For native wrappers
nmethod::nmethod(
Method* method,
@ -773,10 +769,6 @@ nmethod::nmethod(
}
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif
void* nmethod::operator new(size_t size, int nmethod_size, int comp_level) throw () {
return CodeCache::allocate(nmethod_size, CodeCache::get_code_blob_type(comp_level));
}

View File

@ -57,10 +57,6 @@
#include "utilities/globalDefinitions.hpp"
#include "utilities/stack.inline.hpp"
#ifdef _MSC_VER
#pragma warning( push )
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
#endif
ParScanThreadState::ParScanThreadState(Space* to_space_,
ParNewGeneration* young_gen_,
Generation* old_gen_,
@ -104,9 +100,6 @@ ParScanThreadState::ParScanThreadState(Space* to_space_,
_old_gen_closure.set_generation(old_gen_);
_old_gen_root_closure.set_generation(old_gen_);
}
#ifdef _MSC_VER
#pragma warning( pop )
#endif
void ParScanThreadState::record_survivor_plab(HeapWord* plab_start,
size_t plab_word_size) {
@ -597,10 +590,6 @@ void ParNewGenTask::work(uint worker_id) {
par_scan_state.evacuate_followers_closure().do_void();
}
#ifdef _MSC_VER
#pragma warning( push )
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
#endif
ParNewGeneration::ParNewGeneration(ReservedSpace rs, size_t initial_byte_size)
: DefNewGeneration(rs, initial_byte_size, "PCopy"),
_overflow_list(NULL),
@ -643,9 +632,6 @@ ParNewGeneration::ParNewGeneration(ReservedSpace rs, size_t initial_byte_size)
ParallelGCThreads, CHECK);
}
}
#ifdef _MSC_VER
#pragma warning( pop )
#endif
// ParNewGeneration::
ParKeepAliveClosure::ParKeepAliveClosure(ParScanWeakRefClosure* cl) :

View File

@ -454,10 +454,6 @@ bool CMRootRegions::wait_until_scan_finished() {
return true;
}
#ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
#endif // _MSC_VER
uint ConcurrentMark::scale_parallel_threads(uint n_par_threads) {
return MAX2((n_par_threads + 2) / 4, 1U);
}

View File

@ -64,10 +64,6 @@ bool DirtyCardQueue::apply_closure_to_buffer(CardTableEntryClosure* cl,
return true;
}
#ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
#endif // _MSC_VER
DirtyCardQueueSet::DirtyCardQueueSet(bool notify_when_complete) :
PtrQueueSet(notify_when_complete),
_mut_process_closure(NULL),

View File

@ -1807,11 +1807,6 @@ void G1CollectedHeap::shrink(size_t shrink_bytes) {
// Public methods.
#ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
#endif // _MSC_VER
G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
CollectedHeap(),
_g1_policy(policy_),

View File

@ -206,10 +206,6 @@ void ObjPtrQueue::print(const char* name,
}
#endif // PRODUCT
#ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
#endif // _MSC_VER
SATBMarkQueueSet::SATBMarkQueueSet() :
PtrQueueSet(),
_shared_satb_queue(this, true /*perm*/) { }

View File

@ -171,9 +171,11 @@ const jlong max_jlong = CONST64(0x7fffffffffffffff);
#define strdup _strdup
#endif
// Visual Studio 2013 introduced strtoull(); before, one has to use _strtoui64() instead.
#if _MSC_VER < 1800
// Visual Studio 2013 introduced strtoull(); before, one has to use _strtoui64() instead.
#define strtoull _strtoui64
// Fixes some wrong warnings about 'this' : used in base member initializer list
#pragma warning( disable : 4355 )
#endif