ソースを参照

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]
Jürgen Hunold 12 年 前
コミット
c0283f6532
3 ファイル変更5 行追加5 行削除
  1. 1 1
      libs/math
  2. 1 1
      libs/ptr_container
  3. 3 3
      tools/regression/test/test-cases/general/bjam.log

+ 1 - 1
libs/math

@@ -1 +1 @@
-Subproject commit 8cbb412352761434a3aa96aee706fc15f84490f0
+Subproject commit d017041323dedac91b64abcb3e4a207be4f629df

+ 1 - 1
libs/ptr_container

@@ -1 +1 @@
-Subproject commit 0c3cb093bd45a5aee31b3b611b7b4e7507b97fd5
+Subproject commit 06fa75e1415fcda42c4a16fa1ef6974b00bea2cd

+ 3 - 3
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
 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-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
-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
 (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
 **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
 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
 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-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
-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
     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"
 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
 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
 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
-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
     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"
 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"

粤ICP备19079148号