|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r78009 - in trunk/libs/filesystem/test: . msvc10/fstream_test
From: bdawes_at_[hidden]
Date: 2012-04-16 10:06:50
Author: bemandawes
Date: 2012-04-16 10:06:50 EDT (Mon, 16 Apr 2012)
New Revision: 78009
URL: http://svn.boost.org/trac/boost/changeset/78009
Log:
filesystem: Remove universal-character-name from source; was causing failure with Intel/Windows and required warning suppression on VC++
Text files modified:
trunk/libs/filesystem/test/fstream_test.cpp | 12 +++++-------
trunk/libs/filesystem/test/msvc10/fstream_test/fstream_test.vcxproj | 4 ++--
2 files changed, 7 insertions(+), 9 deletions(-)
Modified: trunk/libs/filesystem/test/fstream_test.cpp
==============================================================================
--- trunk/libs/filesystem/test/fstream_test.cpp (original)
+++ trunk/libs/filesystem/test/fstream_test.cpp 2012-04-16 10:06:50 EDT (Mon, 16 Apr 2012)
@@ -41,11 +41,6 @@
#include <boost/detail/lightweight_test.hpp>
#include <boost/detail/lightweight_main.hpp>
-#if defined(_MSC_VER)
-# pragma warning(push) // Save warning settings.
-# pragma warning(disable : 4428) // Disable universal-character-name encountered in source warning.
-#endif
-
namespace
{
bool cleanup = true;
@@ -152,7 +147,7 @@
// test narrow characters
std::cout << "narrow character tests:\n";
- test("v3_fstream_test");
+ test("narrow_fstream_test");
// So that tests are run with known encoding, use Boost UTF-8 codecvt
@@ -165,7 +160,10 @@
// \u2781 is circled 2 against white background == e2 9e 81 in UTF-8
// \u263A is a white smiling face
std::cout << "\nwide character tests:\n";
- test(L"fstream_test_\u2780\u263A");
+ std::wstring ws(L"wide_fstream_test_");
+ ws += 0x2780;
+ ws += 0x263A;
+ test(ws);
return ::boost::report_errors();
}
Modified: trunk/libs/filesystem/test/msvc10/fstream_test/fstream_test.vcxproj
==============================================================================
--- trunk/libs/filesystem/test/msvc10/fstream_test/fstream_test.vcxproj (original)
+++ trunk/libs/filesystem/test/msvc10/fstream_test/fstream_test.vcxproj 2012-04-16 10:06:50 EDT (Mon, 16 Apr 2012)
@@ -61,7 +61,7 @@
</Link>
<PostBuildEvent>
<Message>Executing test $(TargetName).exe...</Message>
- <Command>"$(TargetDir)\$(TargetName).exe"</Command>
+ <Command>"$(TargetDir)\$(TargetName).exe" -no-cleanup</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -85,7 +85,7 @@
</Link>
<PostBuildEvent>
<Message>Executing test $(TargetName).exe...</Message>
- <Command>"$(TargetDir)\$(TargetName).exe"</Command>
+ <Command>"$(TargetDir)\$(TargetName).exe" -no-cleanup</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk