diff options
| -rw-r--r-- | Jamrules.jam | 5 | ||||
| -rw-r--r-- | tests/autotest-local.pl | 2 | ||||
| -rw-r--r-- | tests/autotest-report.pl | 1 | ||||
| -rw-r--r-- | tests/test_document.cpp | 4 |
4 files changed, 11 insertions, 1 deletions
diff --git a/Jamrules.jam b/Jamrules.jam index ab99e13..5357e7e 100644 --- a/Jamrules.jam +++ b/Jamrules.jam @@ -22,6 +22,11 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) ) RESULT += -W -Wall -Wextra -Werror -pedantic ; + if ( $(toolset:I=_0x) ) + { + RESULT += -std=c++0x ; + } + if ( $(fulldebug) ) { RESULT += -g ; diff --git a/tests/autotest-local.pl b/tests/autotest-local.pl index 680fcf6..9816a96 100644 --- a/tests/autotest-local.pl +++ b/tests/autotest-local.pl @@ -24,7 +24,7 @@ sub gcctoolset }
$fast = (shift eq 'fast');
-@toolsets = ($^O =~ /MSWin/) ? (bcc, cw, dmc, ic8, ic9, ic9_x64, ic10, ic10_x64, ic11, ic11_x64, mingw34, mingw44, mingw45, mingw46_x64, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64) : ($^O =~ /solaris/) ? (suncc) : (&gcctoolset());
+@toolsets = ($^O =~ /MSWin/) ? (bcc, cw, dmc, ic8, ic9, ic9_x64, ic10, ic10_x64, ic11, ic11_x64, mingw34, mingw44, mingw45, mingw45_0x, mingw46_x64, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64) : ($^O =~ /solaris/) ? (suncc) : (&gcctoolset());
@configurations = (debug, release);
@defines = (PUGIXML_NO_XPATH, PUGIXML_NO_EXCEPTIONS, PUGIXML_NO_STL, PUGIXML_WCHAR_MODE);
$stddefine = 'PUGIXML_STANDARD';
diff --git a/tests/autotest-report.pl b/tests/autotest-report.pl index 8ed8dd9..151355b 100644 --- a/tests/autotest-report.pl +++ b/tests/autotest-report.pl @@ -13,6 +13,7 @@ sub prettytoolset return "Intel C++ Compiler $1.0" if ($toolset =~ /^ic(\d+)$/);
return "Intel C++ Compiler $1.0 x64" if ($toolset =~ /^ic(\d+)_x64$/);
return "MinGW (GCC $1.$2)" if ($toolset =~ /^mingw(\d)(\d)$/);
+ return "MinGW (GCC $1.$2) C++0x" if ($toolset =~ /^mingw(\d)(\d)_0x$/);
return "MinGW (GCC $1.$2) x64" if ($toolset =~ /^mingw(\d)(\d)_x64$/);
return "Microsoft Visual C++ 7.1" if ($toolset eq 'msvc71');
return "Microsoft Visual C++ $1.0" if ($toolset =~ /^msvc(\d+)$/);
diff --git a/tests/test_document.cpp b/tests/test_document.cpp index 6dbc0fe..bed9498 100644 --- a/tests/test_document.cpp +++ b/tests/test_document.cpp @@ -15,6 +15,10 @@ #include <string>
+#ifdef __MINGW32__
+# include <io.h> // for unlink in C++0x mode
+#endif
+
TEST(document_create_empty)
{
pugi::xml_document doc;
|