Bläddra i källkod

Some size_t related type fixes for VS2013

Marco Nolden 11 år sedan
förälder
incheckning
d6c078190f
2 ändrade filer med 7 tillägg och 7 borttagningar
  1. 3 3
      Libs/Core/ctkBackTrace.cpp
  2. 4 4
      Libs/DICOM/Core/ctkDICOMRetrieve.cpp

+ 3 - 3
Libs/Core/ctkBackTrace.cpp

@@ -73,7 +73,7 @@ struct ctkBackTracePrivate
 {
   std::vector<void *> Frames;
 
-  int trace(void** addresses, int size) const;
+  int trace(void** addresses, size_t size) const;
   std::string getSymbol(void* address) const;
 };
 
@@ -89,7 +89,7 @@ ctkBackTrace::ctkBackTrace(size_t framesNumber)
   if(framesNumber == 0)
     return;
   d->Frames.resize(framesNumber, 0);
-  int size = d->trace(&d->Frames.front(), framesNumber);
+  size_t size = d->trace(&d->Frames.front(), framesNumber);
   d->Frames.resize(size);
 }
 
@@ -155,7 +155,7 @@ int ctkBackTracePrivate::trace(void** array, int n) const
 #elif defined(Q_CC_MSVC)
 
 // --------------------------------------------------------------------------
-int ctkBackTracePrivate::trace(void** array, int n) const
+int ctkBackTracePrivate::trace(void** array, size_t n) const
 {
   if(n>=63)
     n=62;

+ 4 - 4
Libs/DICOM/Core/ctkDICOMRetrieve.cpp

@@ -359,8 +359,8 @@ bool ctkDICOMRetrievePrivate::move ( const QString& studyInstanceUID,
     }
     // Select the last MOVE response to output meaningful status information
     OFIterator<RetrieveResponse*> it = responses.begin();
-  Uint32 numResults = responses.size();
-  for (Uint32 i = 1; i < numResults; i++)
+  size_t numResults = responses.size();
+  for (size_t i = 1; i < numResults; i++)
     {
     it++;
     }
@@ -480,8 +480,8 @@ bool ctkDICOMRetrievePrivate::get ( const QString& studyInstanceUID,
     }
   // Select the last GET response to output meaningful status information
   OFIterator<RetrieveResponse*> it = responses.begin();
-  Uint32 numResults = responses.size();
-  for (Uint32 i = 1; i < numResults; i++)
+  size_t numResults = responses.size();
+  for (size_t i = 1; i < numResults; i++)
     {
     it++;
     }