Unittests: make them compile again in builds with regular boost.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@799 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 18:03:34 +00:00 · 2010-08-23 18:03:34 +00:00 · 72a64192b8
parent 20cc623ecd
commit 72a64192b8
2 changed files with 2 additions and 1 deletions
--- a/code/BoostWorkaround/boost/format.hpp
+++ b/code/BoostWorkaround/boost/format.hpp
@ -9,7 +9,7 @@
 #ifndef AI_BOOST_FORMAT_DUMMY_INCLUDED
 #define AI_BOOST_FORMAT_DUMMY_INCLUDED

-#ifndef BOOST_FORMAT_HPP
+#if (!defined BOOST_FORMAT_HPP) || (defined ASSIMP_FORCE_NOBOOST)

 #include <string>
 #include <vector>
--- a/test/unit/utNoBoostTest.h
+++ b/test/unit/utNoBoostTest.h
@ -3,6 +3,7 @@

 namespace noboost {

+#define ASSIMP_FORCE_NOBOOST
 #include "..\..\code\BoostWorkaround\boost\format.hpp"
 	using boost::format;
 	using boost::str;