From 5c1ad88aa129e5c0aa878447cccf87e711a3770c Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Thu, 1 Feb 2024 13:33:54 -0500 Subject: [PATCH 1/3] reorder header for windows --- src/terralib/kernel/TeUtils.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/terralib/kernel/TeUtils.cpp b/src/terralib/kernel/TeUtils.cpp index 4cc538ea3..dda13272e 100644 --- a/src/terralib/kernel/TeUtils.cpp +++ b/src/terralib/kernel/TeUtils.cpp @@ -8,10 +8,6 @@ * does it submit to any jurisdiction. */ -#include "TeUtils.h" -#include "TeDefines.h" -#include "TeException.h" - #include #include #include @@ -33,6 +29,9 @@ #error "Unsuported plataform for physical memory checking" #endif +#include "TeUtils.h" +#include "TeDefines.h" +#include "TeException.h" string Te2String(const int value) { char name[TeNAME_LENGTH]; From 1387b04557e083a115763dd942f9bd3bf8bc931b Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Thu, 1 Feb 2024 13:48:21 -0500 Subject: [PATCH 2/3] reorder header for windows --- src/terralib/kernel/TeUtils.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/terralib/kernel/TeUtils.cpp b/src/terralib/kernel/TeUtils.cpp index dda13272e..4cc538ea3 100644 --- a/src/terralib/kernel/TeUtils.cpp +++ b/src/terralib/kernel/TeUtils.cpp @@ -8,6 +8,10 @@ * does it submit to any jurisdiction. */ +#include "TeUtils.h" +#include "TeDefines.h" +#include "TeException.h" + #include #include #include @@ -29,9 +33,6 @@ #error "Unsuported plataform for physical memory checking" #endif -#include "TeUtils.h" -#include "TeDefines.h" -#include "TeException.h" string Te2String(const int value) { char name[TeNAME_LENGTH]; From ce7b7b67f4d81d5e2564dc9cd1a73099b8955049 Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Sat, 3 Feb 2024 14:52:59 +0000 Subject: [PATCH 3/3] Comment out unused code --- src/terralib/kernel/TeUtils.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/terralib/kernel/TeUtils.cpp b/src/terralib/kernel/TeUtils.cpp index 4cc538ea3..7052e072a 100644 --- a/src/terralib/kernel/TeUtils.cpp +++ b/src/terralib/kernel/TeUtils.cpp @@ -18,6 +18,9 @@ #include //FAMI #include +#if 0 +/* The code below is unused and does not always compile */ + /* The following includes are needed for pysical memory checking */ #if TePLATFORM == TePLATFORMCODE_MSWINDOWS #include @@ -33,6 +36,7 @@ #error "Unsuported plataform for physical memory checking" #endif +#endif string Te2String(const int value) { char name[TeNAME_LENGTH]; @@ -430,6 +434,8 @@ string TeCheckName(const string& name, bool& changed, string& invalidChar) { return newName; } +#if 0 +/* The code below is unused and does not always compile */ unsigned long int TeGetFreePhysicalMemory() { unsigned long int freemem = 0; @@ -553,3 +559,5 @@ bool TeCheckFileExistence(const std::string& filename) { return true; } } + +#endif