diff options
| author | Jürgen Hunold <jhunold@gmx.eu> | 2013-08-12 14:56:38 +0000 |
|---|---|---|
| committer | Jürgen Hunold <jhunold@gmx.eu> | 2013-08-12 14:56:38 +0000 |
| commit | c0283f65325b6a3d108bc4bcfeb59fda5be3f5d7 (patch) | |
| tree | 383ce04669daafb8352e378fff398ec5a1953fa7 | |
| parent | 89bbd887657fc77bb7af3043316e45d40cab286a (diff) | |
| download | boost-c0283f65325b6a3d108bc4bcfeb59fda5be3f5d7.tar.gz | |
Merge 85234,85235,85236,85237 from ^/trunk
------------------------------------------------------------------------
r85234 | jhunold | 2013-08-07 14:28:00 +0200 (Mi, 07 Aug 2013) | 1 line
Add missing svn:eol-style to be consistent with the other xml files. Needed for smooth git transition
------------------------------------------------------------------------
r85235 | jhunold | 2013-08-07 14:46:11 +0200 (Mi, 07 Aug 2013) | 1 line
Add missing svn:eol-style native. Fixes mixed line endings. Needed for smooth git transition.
------------------------------------------------------------------------
r85236 | jhunold | 2013-08-07 14:50:32 +0200 (Mi, 07 Aug 2013) | 1 line
Add missing svn:eol-style native. Fixes line ending issues discovered by git transition.
------------------------------------------------------------------------
r85237 | jhunold | 2013-08-07 14:52:10 +0200 (Mi, 07 Aug 2013) | 1 line
Add missing svn:eol-style native and mime-type. Fixes line ending issues discovered by git transition.
------------------------------------------------------------------------
[SVN r85321]
| m--------- | libs/math | 0 | ||||
| m--------- | libs/ptr_container | 0 | ||||
| -rw-r--r-- | tools/regression/test/test-cases/general/bjam.log | 6 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libs/math b/libs/math -Subproject 8cbb412352761434a3aa96aee706fc15f84490f +Subproject d017041323dedac91b64abcb3e4a207be4f629d diff --git a/libs/ptr_container b/libs/ptr_container -Subproject 0c3cb093bd45a5aee31b3b611b7b4e7507b97fd +Subproject 06fa75e1415fcda42c4a16fa1ef6974b00bea2c diff --git a/tools/regression/test/test-cases/general/bjam.log b/tools/regression/test/test-cases/general/bjam.log index 71013f7458..a896470f2e 100644 --- a/tools/regression/test/test-cases/general/bjam.log +++ b/tools/regression/test/test-cases/general/bjam.log @@ -46,7 +46,7 @@ MkDir1 ..\..\..\bin.v2\tools\regression\test\compile-fail~pass.test\msvc-7.1\deb MkDir1 ..\..\..\bin.v2\tools\regression\test\compile-fail~pass.test\msvc-7.1\debug\link-static\threading-multi compile-c-c++ ..\..\..\bin.v2\tools\regression\test\compile-fail~pass.test\msvc-7.1\debug\link-static\threading-multi\compile-fail~pass.obj compile-fail~pass.cpp -compile-fail~pass.cpp(9) : fatal error C1189: #error : example of a compile failure
+compile-fail~pass.cpp(9) : fatal error C1189: #error : example of a compile failure (failed-as-expected) ..\..\..\bin.v2\tools\regression\test\compile-fail~pass.test\msvc-7.1\debug\link-static\threading-multi\compile-fail~pass.obj **passed** ..\..\..\bin.v2\tools\regression\test\compile-fail~pass.test\msvc-7.1\debug\link-static\threading-multi\compile-fail~pass.test MkDir1 ..\..\..\bin.v2\tools\regression\test\compile~fail.test @@ -56,7 +56,7 @@ MkDir1 ..\..\..\bin.v2\tools\regression\test\compile~fail.test\msvc-7.1\debug\li MkDir1 ..\..\..\bin.v2\tools\regression\test\compile~fail.test\msvc-7.1\debug\link-static\threading-multi compile-c-c++ ..\..\..\bin.v2\tools\regression\test\compile~fail.test\msvc-7.1\debug\link-static\threading-multi\compile~fail.obj compile~fail.cpp -compile~fail.cpp(9) : fatal error C1189: #error : example of a compile failure
+compile~fail.cpp(9) : fatal error C1189: #error : example of a compile failure call "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat" >nul cl /Zm800 -nologo @"..\..\..\bin.v2\tools\regression\test\compile~fail.test\msvc-7.1\debug\link-static\threading-multi\compile~fail.obj.rsp" @@ -145,7 +145,7 @@ MkDir1 ..\..\..\bin.v2\tools\regression\test\run-fail~compile-fail.test\msvc-7.1 MkDir1 ..\..\..\bin.v2\tools\regression\test\run-fail~compile-fail.test\msvc-7.1\debug\link-static\threading-multi compile-c-c++ ..\..\..\bin.v2\tools\regression\test\run-fail~compile-fail.test\msvc-7.1\debug\link-static\threading-multi\run-fail~compile-fail.obj run-fail~compile-fail.cpp -run-fail~compile-fail.cpp(9) : fatal error C1189: #error : example of a compile failure
+run-fail~compile-fail.cpp(9) : fatal error C1189: #error : example of a compile failure call "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat" >nul cl /Zm800 -nologo @"..\..\..\bin.v2\tools\regression\test\run-fail~compile-fail.test\msvc-7.1\debug\link-static\threading-multi\run-fail~compile-fail.obj.rsp" |