X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSegmentedPalette.h;h=1a53fa745138d9a1fed40664b61a0f49f156a7b0;hb=35ee8ee8af32946514713d271177df8bb2298eb2;hp=452462e84318535e55acece2328eee51423ab5a3;hpb=3cb6c6faea9640d12710d2bebc52ca28a6d32844;p=gdcm.git diff --git a/src/gdcmSegmentedPalette.h b/src/gdcmSegmentedPalette.h index 452462e8..1a53fa74 100644 --- a/src/gdcmSegmentedPalette.h +++ b/src/gdcmSegmentedPalette.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSegmentedPalette.h,v $ Language: C++ - Date: $Date: 2007/11/09 16:11:18 $ - Version: $Revision: 1.18 $ + Date: $Date: 2007/11/13 09:37:22 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -64,11 +64,16 @@ namespace GDCM_NAME_SPACE { -// Long stody short: Sun compiler only provide the second interface of std::distance, since the implemenation -// is so trivial, I'd rather redo it myself. +// Long stody short: Sun compiler only provide the second interface of +// std::distance, since the implementation is so trivial, I'd rather redo it myself. // Ref: // http://www.sgi.com/tech/stl/distance.html#2 -// The second version of distance was the one defined in the original STL, and the first version is the one defined in the draft C++ standard; the definition was changed because the older interface was clumsy and error-prone. The older interface required the use of a temporary variable, and it has semantics that are somewhat nonintuitive: it increments n by the distance from first to last, rather than storing that distance in n +// The second version of distance was the one defined in the original STL, and +// the first version is the one defined in the draft C++ standard; the definition +// was changed because the older interface was clumsy and error-prone. +// The older interface required the use of a temporary variable, and it has semantics +// that are somewhat nonintuitive: it increments n by the distance from first to last, +// rather than storing that distance in n template inline int32_t mydistance(InputIterator first, InputIterator last) @@ -108,7 +113,7 @@ namespace GDCM_NAME_SPACE template class DiscreteSegment : public Segment { public: -#if defined(__sun__) +#if !defined(__sun__) typedef typename Segment::SegmentMap SegmentMap; #endif DiscreteSegment(const EntryType* first) @@ -125,7 +130,7 @@ namespace GDCM_NAME_SPACE template class LinearSegment : public Segment { public: -#if defined(__sun__) +#if !defined(__sun__) typedef typename Segment::SegmentMap SegmentMap; #endif LinearSegment(const EntryType* first) @@ -156,7 +161,7 @@ namespace GDCM_NAME_SPACE template class IndirectSegment : public Segment { public: -#if defined(__sun__) +#if !defined(__sun__) typedef typename Segment::SegmentMap SegmentMap; #endif IndirectSegment(const EntryType* first)