diff options
| -rw-r--r-- | externals/grill/flext/config-pd-msvc.txt | 2 | ||||
| -rw-r--r-- | externals/grill/flext/source/flmap.h | 7 | ||||
| -rw-r--r-- | externals/grill/flext/source/flstdc.h | 8 |
3 files changed, 15 insertions, 2 deletions
diff --git a/externals/grill/flext/config-pd-msvc.txt b/externals/grill/flext/config-pd-msvc.txt index 6d1cc16b..23ce4083 100644 --- a/externals/grill/flext/config-pd-msvc.txt +++ b/externals/grill/flext/config-pd-msvc.txt @@ -3,7 +3,7 @@ # # where is PD? -PDPATH=c:\programme\audio\pd +PDPATH=c:\programme\audio\pd # where is the pthreads package? # (comment out if you use the standard pd package where pthreads are included) diff --git a/externals/grill/flext/source/flmap.h b/externals/grill/flext/source/flmap.h index b32b2652..e93b5466 100644 --- a/externals/grill/flext/source/flmap.h +++ b/externals/grill/flext/source/flmap.h @@ -46,7 +46,12 @@ public: { public: iterator() {} - iterator(AnyMap::iterator it): AnyMap::iterator(it) {} +#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); } inline T &data() const { return *(T *)&((*this)->second); } diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h index 19586a4a..92ea3fe8 100644 --- a/externals/grill/flext/source/flstdc.h +++ b/externals/grill/flext/source/flstdc.h @@ -18,6 +18,14 @@ WARRANTIES, see the file, "license.txt," in this distribution. #ifndef __FLEXT_STDC_H #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 #if FLEXT_SYS == FLEXT_SYS_PD |