ardour/livetrax
13
0
Fork 0
Code

Introduce the BOOST_MPL stuff (though it all seems a bit flaky with MSVC...)

Browse Source
This commit is contained in:
John Emmas 2019-09-18 15:08:26 +01:00
parent cb3afb6981
commit 37194ec805
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/transport_fsm.h
View File

@ -5,6 +5,10 @@
#undef nil #undef nil
#endif #endif
#ifndef BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
#endif
#include <boost/weak_ptr.hpp> #include <boost/weak_ptr.hpp>
#include <boost/msm/back/state_machine.hpp> #include <boost/msm/back/state_machine.hpp>
#include <boost/msm/back/tools.hpp> #include <boost/msm/back/tools.hpp>

12
msvc_extra_headers/ardourext/sys/targetsxs.h.input
View File

@ -76,6 +76,18 @@ __declspec(selectany) int _forceAtlDllManifestRTM;
#endif #endif
#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 /* 'stdint.h' conflicts with various other libraries so
let's #include stdint.h first to ensure one consistent let's #include stdint.h first to ensure one consistent
implementation for commonly used integer types. */ implementation for commonly used integer types. */