v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-standard use of friend in tuple replacement. https://sourceforge.net/projects/assimp/forums/forum/817654/topic/3735078 

Disable PCH for unzip files now for the whole build matrix.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@758 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-06-24 10:49:39 +00:00
parent 3cf930c591
commit 9f951857de
2 changed files with 133 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/BoostWorkaround/boost/tuple/tuple.hpp
View File

@ -152,6 +152,11 @@ namespace boost {
typename T4 = detail::nulltype> typename T4 = detail::nulltype>
class tuple { class tuple {
template <typename T0b,
typename T1b,
typename T2b,
typename T3b,
typename T4b >
friend class tuple; friend class tuple;
private: private:

128
workspaces/vc8/assimp.vcproj
View File

@ -3458,6 +3458,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="release|Win32" Name="release|Win32"
> >
@ -3466,6 +3474,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="release-dll|Win32" Name="release-dll|Win32"
> >
@ -3474,6 +3490,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="debug-dll|Win32" Name="debug-dll|Win32"
> >
@ -3482,6 +3506,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="release-noboost-st|Win32" Name="release-noboost-st|Win32"
> >
@ -3490,6 +3522,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="debug-noboost-st|Win32" Name="debug-noboost-st|Win32"
> >
@ -3498,6 +3538,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="debug-st|Win32" Name="debug-st|Win32"
> >
@ -3506,6 +3554,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="release-st|Win32" Name="release-st|Win32"
> >
@ -3514,6 +3570,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="release-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\contrib\unzip\ioapi.h" RelativePath="..\..\contrib\unzip\ioapi.h"
@ -3530,6 +3594,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="debug|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="release|Win32" Name="release|Win32"
> >
@ -3538,6 +3610,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="release|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="release-dll|Win32" Name="release-dll|Win32"
> >
@ -3546,6 +3626,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="release-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="debug-dll|Win32" Name="debug-dll|Win32"
> >
@ -3554,6 +3642,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="debug-dll|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="release-noboost-st|Win32" Name="release-noboost-st|Win32"
> >
@ -3562,6 +3658,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="release-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="debug-noboost-st|Win32" Name="debug-noboost-st|Win32"
> >
@ -3570,6 +3674,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="debug-noboost-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="debug-st|Win32" Name="debug-st|Win32"
> >
@ -3578,6 +3690,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="debug-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="release-st|Win32" Name="release-st|Win32"
> >
@ -3586,6 +3706,14 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="release-st|x64"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\contrib\unzip\unzip.h" RelativePath="..\..\contrib\unzip\unzip.h"