Program: gdcm
Module: $RCSfile: gdcmSegmentedPalette.h,v $
Language: C++
- Date: $Date: 2007/10/27 17:34:16 $
- Version: $Revision: 1.14 $
+ 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
// And both were coming from a ALOKA SSD-4000 station
//
// JPRx :
-// It compiles fine under gcc 4.1.2 and msvc 7
+// It compiles fine under gcc 4.1.2, msvc 7 and DarwinG5-g++
// It doesn't compile on msvc 6, borland and SunOS
// Any fix welcome !
#endif
// Hack for Borland
-#if defined(__BORLANDC__)
+#if (defined(_MSC_VER) && (_MSC_VER < 1310)) || defined(__BORLANDC__)
#define GDCM_TYPENAME2
#else
#define GDCM_TYPENAME2 typename
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<typename InputIterator>
inline int32_t
mydistance(InputIterator first, InputIterator last)
template <typename EntryType>
class Segment {
public:
- typedef std::map<const EntryType*, const Segment*> SegmentMap;
+ typedef std::map<const EntryType* const, const Segment*> SegmentMap;
virtual bool Expand(const SegmentMap& instances,
std::vector<EntryType>& expanded) const = 0;
const EntryType* First() const { return _first; }
- const EntryType* Last() const { return _last; }
+ const EntryType* Last() const { return _last; }
struct ToMap {
typename SegmentMap::value_type
operator()(const Segment* segment) const
template <typename EntryType>
class DiscreteSegment : public Segment<EntryType> {
public:
+#if !defined(__sun__)
typedef typename Segment<EntryType>::SegmentMap SegmentMap;
+#endif
DiscreteSegment(const EntryType* first)
: Segment<EntryType>(first, first+2+*(first+1)) {}
virtual bool Expand(const SegmentMap&,
template <typename EntryType>
class LinearSegment : public Segment<EntryType> {
public:
+#if !defined(__sun__)
typedef typename Segment<EntryType>::SegmentMap SegmentMap;
+#endif
LinearSegment(const EntryType* first)
: Segment<EntryType>(first, first+3) {}
virtual bool Expand(const SegmentMap&,
template <typename EntryType>
class IndirectSegment : public Segment<EntryType> {
public:
+#if !defined(__sun__)
typedef typename Segment<EntryType>::SegmentMap SegmentMap;
+#endif
IndirectSegment(const EntryType* first)
: Segment<EntryType>(first, first+2+4/sizeof(EntryType)) {}
virtual bool Expand(const SegmentMap& instances,