From 72927d983f1f84127e83bf2d80db6b8ee882bad7 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 26 Mar 2010 15:56:04 -0800 Subject: library loading on windows, status message tweaks, warning tweaks --- host/include/uhd/config.hpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'host/include') diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp index 10f9c093f..8e30a8333 100644 --- a/host/include/uhd/config.hpp +++ b/host/include/uhd/config.hpp @@ -35,8 +35,15 @@ # pragma warning(disable: 4275) // non dll-interface class ... used as base for dll-interface class ... //# pragma warning(disable: 4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data //# pragma warning(disable: 4511) // 'class' : copy constructor could not be generated -#endif +#endif +//define logical operators +#ifdef BOOST_MSVC + #define not ! + #define and && + #define or || +#endif + // http://gcc.gnu.org/wiki/Visibility // Generic helper definitions for shared library support #if defined _WIN32 || defined __CYGWIN__ -- cgit v1.2.3