changeset 6:9d483cf71d17

fix warnings
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 19 Jul 2012 22:39:52 +0200
parents 01163b17a028
children 8a7db884ae83 3a584803783e
files PalantirServer/DicomIntegerPixelAccessor.cpp PalantirServer/ServerIndex.cpp
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/PalantirServer/DicomIntegerPixelAccessor.cpp	Thu Jul 19 22:38:30 2012 +0200
+++ b/PalantirServer/DicomIntegerPixelAccessor.cpp	Thu Jul 19 22:39:52 2012 +0200
@@ -20,7 +20,10 @@
 
 #include "DicomIntegerPixelAccessor.h"
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
+
 #include "../Core/PalantirException.h"
 #include "FromDcmtkBridge.h"
 #include <boost/lexical_cast.hpp>
--- a/PalantirServer/ServerIndex.cpp	Thu Jul 19 22:38:30 2012 +0200
+++ b/PalantirServer/ServerIndex.cpp	Thu Jul 19 22:39:52 2012 +0200
@@ -22,7 +22,10 @@
 
 using namespace Palantir;
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
+
 #include <EmbeddedResources.h>
 #include "../Core/Toolbox.h"
 #include "../Core/Uuid.h"