Commit 21700d38 authored by remicres's avatar remicres

FIX: correct environment 32/64 related pragmas

parent 731926ae
...@@ -21,24 +21,6 @@ ...@@ -21,24 +21,6 @@
#include "otbImageFileWriter.h" #include "otbImageFileWriter.h"
#endif #endif
// Check windows
#if _WIN32 || _WIN64
#if _WIN64
#define ENVIRONMENT64
#else
#define ENVIRONMENT32
#endif
#endif
// Check GCC
#if __GNUC__
#if __x86_64__ || __ppc64__
#define ENVIRONMENT64
#else
#define ENVIRONMENT32
#endif
#endif
/* /*
* This function returns TRUE if the process #myrank is assigned * This function returns TRUE if the process #myrank is assigned
* to the task #div in a pool of #nprocs processes * to the task #div in a pool of #nprocs processes
......
#ifndef __LSRM_SEGMENTER_H #ifndef __LSRM_SEGMENTER_H
#define __LSRM_SEGMENTER_H #define __LSRM_SEGMENTER_H
// Check windows
#if _WIN32 || _WIN64
#if _WIN64
#define ENVIRONMENT64
#else
#define ENVIRONMENT32
#endif
#endif
// Check GCC
#if __GNUC__
#if __x86_64__ || __ppc64__
#define ENVIRONMENT64
#else
#define ENVIRONMENT32
#endif
#endif
#include "macro-generator.h" #include "macro-generator.h"
#include "grmSegmenter.h" #include "grmSegmenter.h"
#include "lsgrmGraphToOtbImage.h" #include "lsgrmGraphToOtbImage.h"
...@@ -175,6 +194,9 @@ public: ...@@ -175,6 +194,9 @@ public:
{ {
long long unsigned int memory = 0; long long unsigned int memory = 0;
// sizeof(graph)... even if not significant
memory += sizeof(GraphType);
for(auto& node : this->m_Graph.m_Nodes) for(auto& node : this->m_Graph.m_Nodes)
{ {
// size of the contour (boost::dynamic_bitset) // size of the contour (boost::dynamic_bitset)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment