Skip to content
Snippets Groups Projects
Commit f6585154 authored by Julien Malik's avatar Julien Malik
Browse files

COMP: Do not use TIME_UTC for variable name

This should fix compilation on ArchLinux with gcc4.7/boost1.50
See also https://svn.boost.org/trac/boost/ticket/6940
parent 16f9bb0f
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ namespace ossimplugins ...@@ -20,7 +20,7 @@ namespace ossimplugins
static const char PREFIX[] = "imageNoise."; static const char PREFIX[] = "imageNoise.";
static const char TIME_UTC[] = "timeUTC"; static const char TIME_UTC_KW[] = "timeUTC";
static const char NOISE_ESTIMATE[] = "noiseEstimate."; static const char NOISE_ESTIMATE[] = "noiseEstimate.";
static const char REFERENCE_POINT[] = "referencePoint"; static const char REFERENCE_POINT[] = "referencePoint";
static const char VALIDITY_RANGE_MIN[] = "validityRangeMin"; static const char VALIDITY_RANGE_MIN[] = "validityRangeMin";
...@@ -74,7 +74,7 @@ namespace ossimplugins ...@@ -74,7 +74,7 @@ namespace ossimplugins
pfx = prefix; pfx = prefix;
} }
pfx += PREFIX; pfx += PREFIX;
kwl.add(pfx.c_str(), TIME_UTC, _timeUTC); kwl.add(pfx.c_str(), TIME_UTC_KW, _timeUTC);
pfx2 = pfx + NOISE_ESTIMATE; pfx2 = pfx + NOISE_ESTIMATE;
kwl.add(pfx2.c_str(), VALIDITY_RANGE_MIN, _validityRangeMin); kwl.add(pfx2.c_str(), VALIDITY_RANGE_MIN, _validityRangeMin);
...@@ -106,7 +106,7 @@ namespace ossimplugins ...@@ -106,7 +106,7 @@ namespace ossimplugins
const char* lookup = 0; const char* lookup = 0;
pfx += PREFIX; pfx += PREFIX;
lookup = kwl.find(pfx.c_str(), TIME_UTC); lookup = kwl.find(pfx.c_str(), TIME_UTC_KW);
if (lookup) if (lookup)
{ {
s = lookup; s = lookup;
...@@ -115,7 +115,7 @@ namespace ossimplugins ...@@ -115,7 +115,7 @@ namespace ossimplugins
else else
{ {
ossimNotify(ossimNotifyLevel_WARN) ossimNotify(ossimNotifyLevel_WARN)
<< MODULE << " Keyword not found: " << TIME_UTC << " in "<<pfx.c_str()<<" path.\n"; << MODULE << " Keyword not found: " << TIME_UTC_KW << " in "<<pfx.c_str()<<" path.\n";
result = false; result = false;
} }
pfx2 = pfx + NOISE_ESTIMATE; pfx2 = pfx + NOISE_ESTIMATE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment