Index: vtkTimeStamp.cxx
===================================================================
RCS file: /cvsroot/VTK/VTK/Common/vtkTimeStamp.cxx,v
retrieving revision 1.31
diff -r1.31 vtkTimeStamp.cxx
22a23,25
> #if defined(__APPLE__)
>   #include <libkern/OSAtomic.h>
> #endif
33a37
> // Windows optimization
36d39
< 
37a41,56
> 
> // Mac optimization (64 bit)
> #elif defined(__APPLE__) && __LP64__
>   // "ModifiedTime" is "unsigned long", a type that changess sizes
>   // depending on architecture.  The atomic increment is safe, since it
>   // operates on a variable of the exact type needed.  The cast does not
>   // change the size, but does change signedness, which is not ideal.
>   static volatile int64_t vtkTimeStampTime = 0;
>   this->ModifiedTime = (unsigned long)OSAtomicIncrement64Barrier(&vtkTimeStampTime);
> 
> // Mac optimization (32 bit, 10.4 or later)
> #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1040)
>   static volatile int32_t vtkTimeStampTime = 0;
>   this->ModifiedTime = (unsigned long)OSAtomicIncrement32Barrier(&vtkTimeStampTime);
> 
> // General case
47,55d65
< 
< 
< 
< 
< 
< 
< 
< 
< 
Index: vtkTimeStamp.h
===================================================================
RCS file: /cvsroot/VTK/VTK/Common/vtkTimeStamp.h,v
retrieving revision 1.46
diff -r1.46 vtkTimeStamp.h
48c48
<   unsigned long int GetMTime() {return this->ModifiedTime;};
---
>   unsigned long GetMTime() const {return this->ModifiedTime;};
52c52
<   int operator>(vtkTimeStamp& ts) {
---
>   bool operator>(vtkTimeStamp& ts) {
54c54
<   int operator<(vtkTimeStamp& ts) {
---
>   bool operator<(vtkTimeStamp& ts) {
59c59
<   operator unsigned long() {return this->ModifiedTime;};
---
>   operator unsigned long() const {return this->ModifiedTime;};

Index: itkTimeStamp.cxx
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/Common/itkTimeStamp.cxx,v
retrieving revision 1.11
diff -r1.11 itkTimeStamp.cxx
21a22,24
> #if defined(__APPLE__)
>   #include <libkern/OSAtomic.h>
> #endif
43a47,67
> // Windows optimization
> #if defined(WIN32) || defined(_WIN32)
>   static LONG itkTimeStampTime = 0;
>   this->ModifiedTime = (unsigned long)InterlockedIncrement(&itkTimeStampTime);
> 
> // Mac optimization (64 bit)
> #elif defined(__APPLE__) && __LP64__
>   // "m_ModifiedTime" is "unsigned long", a type that changess sizes
>   // depending on architecture.  The atomic increment is safe, since it
>   // operates on a variable of the exact type needed.  The cast does not
>   // change the size, but does change signedness, which is not ideal.
>   static volatile int64_t itkTimeStampTime = 0;
>   m_ModifiedTime = (unsigned long)OSAtomicIncrement64Barrier(&itkTimeStampTime);
> 
> // Mac optimization (32 bit, 10.4 or later)
> #elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED >= 1040)
>   static volatile int32_t itkTimeStampTime = 0;
>   m_ModifiedTime = (unsigned long)OSAtomicIncrement32Barrier(&itkTimeStampTime);
> 
> // General case
> #else
54a79,81
> #endif
> 
> 
Index: itkTimeStamp.h
===================================================================
RCS file: /cvsroot/Insight/Insight/Code/Common/itkTimeStamp.h,v
retrieving revision 1.19
diff -r1.19 itkTimeStamp.h
72c72
<   unsigned long int GetMTime() const
---
>   unsigned long GetMTime() const
76c76
<   int operator>(TimeStamp& ts) 
---
>   bool operator>(TimeStamp& ts) 
78c78
<   int operator<(TimeStamp& ts) 
---
>   bool operator<(TimeStamp& ts)