Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
LSGRM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cresson Remi
LSGRM
Commits
21700d38
Commit
21700d38
authored
Sep 02, 2016
by
remicres
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX: correct environment 32/64 related pragmas
parent
731926ae
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
18 deletions
+22
-18
include/lsgrmHeader.h
include/lsgrmHeader.h
+0
-18
include/lsgrmSegmenter.h
include/lsgrmSegmenter.h
+22
-0
No files found.
include/lsgrmHeader.h
View file @
21700d38
...
@@ -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
...
...
include/lsgrmSegmenter.h
View file @
21700d38
#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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment