[PD-cvs] externals/grill/flext/source flmap.h,1.1,1.2 flstdc.h,1.23,1.24

[Thomas Grill]

Update of /cvsroot/pure-data/externals/grill/flext/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20142/source

Modified Files:
	flmap.h flstdc.h 
Log Message:
 ""

Index: flmap.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flmap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** flmap.h	23 Apr 2004 22:14:14 -0000	1.1
--- flmap.h	10 Aug 2004 03:32:04 -0000	1.2
***************
*** 47,51 ****
      public:
          iterator() {}
!         iterator(AnyMap::iterator it): AnyMap::iterator(it) {}
  
          inline K &key() const { return *(K *)&((*this)->first); }
--- 47,56 ----
      public:
          iterator() {}
! #if defined(_MSC_VER) && (_MSC_VER < 0x1300)
!         // with the MSVC6 STL implementation iterators can't be initialized...
!         iterator(AnyMap::iterator &it) { static_cast<AnyMap::iterator &>(*this) = it; }
! #else
!         iterator(AnyMap::iterator &it): AnyMap::iterator(it) {}
! #endif
  
          inline K &key() const { return *(K *)&((*this)->first); }

Index: flstdc.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstdc.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** flstdc.h	21 Jun 2004 13:58:19 -0000	1.23
--- flstdc.h	10 Aug 2004 03:32:04 -0000	1.24
***************
*** 19,22 ****
--- 19,30 ----
  #define __FLEXT_STDC_H
  
+ #if defined(_MSC_VER) && (_MSC_VER < 0x1300)
+ /* 
+     include math.h here - when included with PD or Max/MSP headers,  
+     C linkage would be used which disturbs MSVC6
+ */
+ #include <math.h>
+ #endif
+ 
  // PD stuff