Cast to/from void* pointers with static_cast.

Author: jblueh

include/opdi/backend/ompt/omptBackend.cpp

@@ -50,7 +50,7 @@ extern "C" ompt_start_tool_result_t* ompt_start_tool(unsigned int ompVersion, ch
   startTool->initialize = opdi::OmptBackend::onInitialize;
   startTool->finalize = opdi::OmptBackend::onFinalize;
   opdi::backend = new opdi::OmptBackend;
-  startTool->tool_data.ptr = (void*) opdi::backend;
+  startTool->tool_data.ptr = static_cast<void*>(opdi::backend);
 
   return startTool;
 }

include/opdi/logic/omp/masterOmpLogic.cpp

@@ -36,7 +36,7 @@
 void opdi::MasterOmpLogic::reverseFunc(void *dataPtr) {
 
   #if OPDI_OMP_LOGIC_INSTRUMENT
-    Data* data = (Data*) dataPtr;
+    Data* data = static_cast<Data*>(dataPtr);
     for (auto& instrument : ompLogicInstruments) {
       instrument->reverseMaster(data);
     }
@@ -47,7 +47,7 @@ void opdi::MasterOmpLogic::reverseFunc(void *dataPtr) {
 
 void opdi::MasterOmpLogic::deleteFunc(void* dataPtr) {
 
-  Data* data = (Data*) dataPtr;
+  Data* data = static_cast<Data*>(dataPtr);
   delete data;
 }
 
@@ -64,7 +64,7 @@ void opdi::MasterOmpLogic::onMaster(ScopeEndpoint endpoint) {
         data->endpoint = endpoint;
 
         Handle* handle = new Handle;
-        handle->data = (void*) data;
+        handle->data = static_cast<void*>(data);
         handle->reverseFunc = MasterOmpLogic::reverseFunc;
         handle->deleteFunc = MasterOmpLogic::deleteFunc;
         tool->pushExternalFunction(tool->getThreadLocalTape(), handle);

include/opdi/logic/omp/mutexOmpLogic.cpp

@@ -48,7 +48,7 @@ void opdi::MutexOmpLogic::checkKind(MutexKind kind) {
 
 void opdi::MutexOmpLogic::waitReverseFunc(void* dataPtr) {
 
-  Data* data = (Data*) dataPtr;
+  Data* data = static_cast<Data*>(dataPtr);
 
   #if OPDI_OMP_LOGIC_INSTRUMENT
     for (auto& instrument : ompLogicInstruments) {
@@ -74,13 +74,13 @@ void opdi::MutexOmpLogic::waitReverseFunc(void* dataPtr) {
 }
 
 void opdi::MutexOmpLogic::waitDeleteFunc(void* dataPtr) {
-  Data* data = (Data*) dataPtr;
+  Data* data = static_cast<Data*>(dataPtr);
   delete data;
 }
 
 void opdi::MutexOmpLogic::decrementReverseFunc(void* dataPtr) {
 
-  Data* data = (Data*) dataPtr;
+  Data* data = static_cast<Data*>(dataPtr);
 
   #ifdef __SANITIZE_THREAD__
     ANNOTATE_RWLOCK_RELEASED(&MutexOmpLogic::tsanDummies[data->kind][data->waitId], true);
@@ -98,7 +98,7 @@ void opdi::MutexOmpLogic::decrementReverseFunc(void* dataPtr) {
 }
 
 void opdi::MutexOmpLogic::decrementDeleteFunc(void* dataPtr) {
-  Data* data = (Data*) dataPtr;
+  Data* data = static_cast<Data*>(dataPtr);
   delete data;
 }
 
@@ -162,7 +162,7 @@ void opdi::MutexOmpLogic::onMutexAcquired(MutexKind kind, WaitId waitId) {
 
       // push decrement handle
       Handle* handle = new Handle;
-      handle->data = (void*) data;
+      handle->data = static_cast<void*>(data);
       handle->reverseFunc = MutexOmpLogic::decrementReverseFunc;
       handle->deleteFunc = MutexOmpLogic::decrementDeleteFunc;
 
@@ -205,7 +205,7 @@ void opdi::MutexOmpLogic::onMutexReleased(MutexKind kind, WaitId waitId) {
 
       // push wait handle
       Handle* handle = new Handle;
-      handle->data = (void*) data;
+      handle->data = static_cast<void*>(data);
       handle->reverseFunc = MutexOmpLogic::waitReverseFunc;
       handle->deleteFunc = MutexOmpLogic::waitDeleteFunc;
 
@@ -266,16 +266,16 @@ void* opdi::MutexOmpLogic::exportState() {
   for (std::size_t mutexKind = 0; mutexKind < nMutexKind; ++mutexKind) {
     (*state)[mutexKind] = this->recordings[mutexKind].counters;
   }
-  return (void*) state;
+  return static_cast<void*>(state);
 }
 
 void opdi::MutexOmpLogic::freeState(void* statePtr) {
-  State* state = (State*) statePtr;
+  State* state = static_cast<State*>(statePtr);
   delete state;
 }
 
 void opdi::MutexOmpLogic::recoverState(void* statePtr) {
-  State* state = (State*) statePtr;
+  State* state = static_cast<State*>(statePtr);
   for (std::size_t mutexKind = 0; mutexKind < nMutexKind; ++mutexKind) {
     this->recordings[mutexKind].counters = (*state)[mutexKind];
   }

include/opdi/logic/omp/syncRegionOmpLogic.cpp

@@ -33,7 +33,7 @@
 void opdi::SyncRegionOmpLogic::reverseFunc(void* dataPtr) {
 
   #if OPDI_OMP_LOGIC_INSTRUMENT
-    Data* data = (Data*) dataPtr;
+    Data* data = static_cast<Data*>(dataPtr);
     for (auto& instrument : ompLogicInstruments) {
       instrument->reverseSyncRegion(data);
     }
@@ -46,7 +46,7 @@ void opdi::SyncRegionOmpLogic::reverseFunc(void* dataPtr) {
 
 void opdi::SyncRegionOmpLogic::deleteFunc(void* dataPtr) {
 
-  Data* data = (Data*) dataPtr;
+  Data* data = static_cast<Data*>(dataPtr);
   delete data;
 }
 
@@ -57,7 +57,7 @@ void opdi::SyncRegionOmpLogic::internalPushHandle(SyncRegionKind kind, ScopeEndp
   data->endpoint = endpoint;
 
   Handle* handle = new Handle;
-  handle->data = (void*) data;
+  handle->data = static_cast<void*>(data);
   handle->reverseFunc = SyncRegionOmpLogic::reverseFunc;
   handle->deleteFunc = SyncRegionOmpLogic::deleteFunc;
 

include/opdi/logic/omp/workOmpLogic.cpp

@@ -35,7 +35,7 @@
 void opdi::WorkOmpLogic::reverseFunc(void *dataPtr) {
 
   #if OPDI_OMP_LOGIC_INSTRUMENT
-    Data* data = (Data*) dataPtr;
+    Data* data = static_cast<Data*>(dataPtr);
     for (auto& instrument : ompLogicInstruments) {
       instrument->reverseWork(data);
     }
@@ -46,7 +46,7 @@ void opdi::WorkOmpLogic::reverseFunc(void *dataPtr) {
 
 void opdi::WorkOmpLogic::deleteFunc(void* dataPtr) {
 
-  Data* data = (Data*) dataPtr;
+  Data* data = static_cast<Data*>(dataPtr);
   delete data;
 }
 
@@ -65,7 +65,7 @@ void opdi::WorkOmpLogic::onWork(WorksharingKind kind, ScopeEndpoint endpoint) {
         data->endpoint = endpoint;
 
         Handle* handle = new Handle;
-        handle->data = (void*) data;
+        handle->data = static_cast<void*>(data);
         handle->reverseFunc = WorkOmpLogic::reverseFunc;
         handle->deleteFunc = WorkOmpLogic::deleteFunc;
         tool->pushExternalFunction(tool->getThreadLocalTape(), handle);

include/opdi/misc/tapedOutput.hpp

@@ -50,12 +50,12 @@ namespace opdi {
       };
 
       static void reversePrint(void* dataPtr) {
-        ReversePrintData* data = (ReversePrintData*)dataPtr;
+        ReversePrintData* data = static_cast<ReversePrintData*>(dataPtr);
         print(data->message);
       }
 
       static void reversePrintDelete(void* dataPtr) {
-        ReversePrintData* data = (ReversePrintData*)dataPtr;
+        ReversePrintData* data = static_cast<ReversePrintData*>(dataPtr);
         delete data;
       }