Try disabling C4389 for GTest only for MSVC
parent
b15c111805
commit
6b32f34fc2
|
@ -43,10 +43,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
// We need to be sure to have the same STL settings as Assimp
|
// We need to be sure to have the same STL settings as Assimp
|
||||||
|
|
||||||
#include <assimp/cimport.h>
|
#include <assimp/cimport.h>
|
||||||
#pragma warning(push)
|
#ifdef _MSC_VER
|
||||||
#pragma warning(disable:4389)
|
# pragma warning(push)
|
||||||
|
# pragma warning(disable : 4389)
|
||||||
|
#endif
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#pragma warning(pop)
|
#ifdef _MSC_VER
|
||||||
|
# pragma warning(pop)
|
||||||
|
#endif
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "UTLogStream.h"
|
#include "UTLogStream.h"
|
||||||
|
|
Loading…
Reference in New Issue