summaryrefslogtreecommitdiff
path: root/tests/main.cpp
diff options
context:
space:
mode:
authorarseny.kapoulkine@gmail.com <arseny.kapoulkine@gmail.com@99668b35-9821-0410-8761-19e4c4f06640>2012-03-06 16:56:45 +0000
committerarseny.kapoulkine@gmail.com <arseny.kapoulkine@gmail.com@99668b35-9821-0410-8761-19e4c4f06640>2012-03-06 16:56:45 +0000
commit199b97a851f20bb5fa3d3f2d6dd0debb5a9f0ec3 (patch)
tree051ab8cb1b09635b3db736394c061957d8351058 /tests/main.cpp
parenteca76db49db04d8c05719a8d6edb3e2855c79d8d (diff)
tests: Miscellaneous fixes
git-svn-id: http://pugixml.googlecode.com/svn/trunk@850 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'tests/main.cpp')
-rw-r--r--tests/main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/main.cpp b/tests/main.cpp
index d580a03..6641e8d 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -12,6 +12,7 @@
#ifdef _WIN32_WCE
# undef DebugBreak
+# pragma warning(disable: 4201) // nonstandard extension used: nameless struct/union
# include <windows.h>
#endif
@@ -61,6 +62,8 @@ static void replace_memory_management()
}
#if defined(_MSC_VER) && _MSC_VER > 1200 && _MSC_VER < 1400 && !defined(__INTEL_COMPILER) && !defined(__DMC__)
+#include <exception>
+
namespace std
{
_CRTIMP2 _Prhand _Raise_handler;
@@ -121,6 +124,8 @@ static bool run_test(test_runner* test)
}
#if defined(__CELLOS_LV2__) && defined(PUGIXML_NO_EXCEPTIONS) && !defined(__SNC__)
+#include <exception>
+
void std::exception::_Raise() const
{
abort();