diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2019-09-18 15:08:26 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2019-09-18 15:08:26 +0100 |
| commit | 37194ec805807143c2d9cb4a76ab7f258a3d0622 (patch) | |
| tree | 6cb1557df678eb370803af6a0a1b914bdebe9425 | |
| parent | cb3afb6981728ccf0527365a25533b02468b3246 (diff) | |
Introduce the BOOST_MPL stuff (though it all seems a bit flaky with MSVC...)
| -rw-r--r-- | libs/ardour/ardour/transport_fsm.h | 4 | ||||
| -rw-r--r-- | msvc_extra_headers/ardourext/sys/targetsxs.h.input | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/libs/ardour/ardour/transport_fsm.h b/libs/ardour/ardour/transport_fsm.h index 689db5c16c..f175f8161a 100644 --- a/libs/ardour/ardour/transport_fsm.h +++ b/libs/ardour/ardour/transport_fsm.h @@ -5,6 +5,10 @@ #undef nil #endif +#ifndef BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS +#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS +#endif + #include <boost/weak_ptr.hpp> #include <boost/msm/back/state_machine.hpp> #include <boost/msm/back/tools.hpp> diff --git a/msvc_extra_headers/ardourext/sys/targetsxs.h.input b/msvc_extra_headers/ardourext/sys/targetsxs.h.input index 7ab3f68ddf..c2e2b4d3bc 100644 --- a/msvc_extra_headers/ardourext/sys/targetsxs.h.input +++ b/msvc_extra_headers/ardourext/sys/targetsxs.h.input @@ -76,6 +76,18 @@ __declspec(selectany) int _forceAtlDllManifestRTM; #endif #endif +#define BOOST_MPL_LIMIT_VECTOR_SIZE 30 +#ifdef NDEBUG +/* This one needs further investigation as it's */ +/* causing errors in the MSVC Debuggable builds */ +#define BOOST_MPL_LIMIT_MAP_SIZE 30 + +/* And this one seems dodgy in all builds (it's causing */ +/* various compile issues which change depending on the */ +/* inclusion order of our #included boost header files) */ +//#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS +#endif + /* 'stdint.h' conflicts with various other libraries so let's #include stdint.h first to ensure one consistent implementation for commonly used integer types. */ |