Skip to content
Snippets Groups Projects
Commit 739f9b5a authored by Otmane Lahlou's avatar Otmane Lahlou
Browse files

ENH: use itk::itksysFundamentalType_UInt64. itk::uint64_t not defined on WIN32 palteform

         Corrected on ITKV4, backout this changeset when updating ITK to V4
parent d26824d6
No related branches found
No related tags found
No related merge requests found
......@@ -139,11 +139,11 @@ ConfigurationFile
return ret;
}
itk::uint64_t
::itksysFundamentalType_UInt64
ConfigurationFile
::GetAvailableRAMInBytes() const
{
itk::uint64_t availableRAMInBytes = 0;
::itksysFundamentalType_UInt64 availableRAMInBytes = 0;
otbMsgDevMacro(<< "Retrieving available RAM size from configuration");
// Retrieve it from the configuration
......@@ -152,7 +152,7 @@ ConfigurationFile
typedef otb::ConfigurationFile ConfigurationType;
ConfigurationType::Pointer conf = ConfigurationType::GetInstance();
availableRAMInBytes = conf->GetParameter< itk::uint64_t >(
availableRAMInBytes = conf->GetParameter< ::itksysFundamentalType_UInt64 >(
"OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING");
}
catch(...)
......
......@@ -23,7 +23,7 @@
#include "itkObject.h"
#include "itkObjectFactory.h"
#include "ConfigFile.h"
#include "itkIntTypes.h"
#include "itksys/FundamentalType.h"
namespace otb
{
......@@ -81,12 +81,12 @@ public:
std::string GetGeoidFile() const;
/** Returns the available RAM in bytes */
itk::uint64_t GetAvailableRAMInBytes() const;
::itksysFundamentalType_UInt64 GetAvailableRAMInBytes() const;
/** Returns the available RAM in MBytes*/
itk::uint64_t GetAvailableRAMInMBytes() const
::itksysFundamentalType_UInt64 GetAvailableRAMInMBytes() const
{
return static_cast< itk::uint64_t >(GetAvailableRAMInBytes() / 1024 / 1024);
return static_cast< ::itksysFundamentalType_UInt64 >(GetAvailableRAMInBytes() / 1024 / 1024);
}
protected:
......
......@@ -20,7 +20,7 @@
#include "itkProcessObject.h"
#include "itkDataObject.h"
#include "itkIntTypes.h"
#include "itksys/FundamentalType.h"
#include <set>
namespace otb
......@@ -74,7 +74,7 @@ public:
typedef ProcessObjectType::Pointer ProcessObjectPointerType;
typedef itk::DataObject DataObjectType;
typedef DataObjectType::Pointer DataObjectPointerType;
typedef itk::uint64_t MemoryPrintType;
typedef ::itksysFundamentalType_UInt64 MemoryPrintType;
typedef std::set<const ProcessObjectType *> ProcessObjectPointerSetType;
/** Run-time type information (and related methods). */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment