From: <ric...@us...> - 2009-01-20 07:25:45
|
Revision: 918 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=918&view=rev Author: rich_sposato Date: 2009-01-20 07:25:36 +0000 (Tue, 20 Jan 2009) Log Message: ----------- Adding tests for SafeBits component. Added Paths: ----------- trunk/test/SafeBits/ trunk/test/SafeBits/SafeBitTest.cpp trunk/test/SafeBits/SafeBits.cbp trunk/test/SafeBits/SafeBits.vcproj Added: trunk/test/SafeBits/SafeBitTest.cpp =================================================================== --- trunk/test/SafeBits/SafeBitTest.cpp (rev 0) +++ trunk/test/SafeBits/SafeBitTest.cpp 2009-01-20 07:25:36 UTC (rev 918) @@ -0,0 +1,287 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// This is a test program for Safe-Bit-Fields in the Loki Library. +// Copyright (c) 2009 by Fedor Pikus & Rich Sposato +// The copyright on this file is protected under the terms of the MIT license. +// +// Permission to use, copy, modify, distribute and sell this software for any +// purpose is hereby granted without fee, provided that the above copyright +// notice appear in all copies and that both that copyright notice and this +// permission notice appear in supporting documentation. +// The author makes no claims about the suitability of this software for any +// purpose. It is provided "as is" without express or implied warranty. +//////////////////////////////////////////////////////////////////////////////// + +// $Id$ + + +#include <loki/SafeBits.h> + +#include <iostream> + +using namespace std; +using namespace Loki; + + +LOKI_BIT_FIELD( unsigned int ) Cat_state; +LOKI_BIT_CONST( Cat_state, CAT_NO_STATE, 0 ); // 0x0000 - no bit is set +LOKI_BIT_CONST( Cat_state, CAT_SLEEPING, 1 ); // 0x0001 - 1st bit is set +LOKI_BIT_CONST( Cat_state, CAT_PURRING, 2 ); // 0x0002 - 2nd bit is set +LOKI_BIT_CONST( Cat_state, CAT_PLAYING, 3 ); // 0x0004 - 3rd bit is set +LOKI_BIT_FIELD( unsigned int ) Dog_state; +LOKI_BIT_CONST( Dog_state, DOG_BARKING, 1 ); +LOKI_BIT_CONST( Dog_state, DOG_CHEWING, 2 ); +LOKI_BIT_CONST( Dog_state, DOG_DROOLING, 3 ); + +int main( void ) +{ + cout << "Running tests on Loki safe bit fields." << endl; + + Cat_state cat_state = CAT_SLEEPING; + assert( cat_state ); + Dog_state dog_state = DOG_DROOLING; + assert( dog_state ); + bool happy = cat_state & ( CAT_SLEEPING | CAT_PURRING ); // OK + assert( happy ); + + assert( CAT_SLEEPING < CAT_PURRING ); + assert( CAT_SLEEPING <= CAT_SLEEPING ); + assert( CAT_SLEEPING <= CAT_PURRING ); + assert( CAT_SLEEPING != CAT_PURRING ); + assert( CAT_SLEEPING == CAT_SLEEPING ); + assert( CAT_PURRING >= CAT_SLEEPING ); + assert( CAT_PURRING >= CAT_PURRING ); + +#ifdef ERROR1 + assert( DOG_DROOLING != CAT_SLEEPING ); // Can't compare different types. +#endif +#ifdef ERROR2 + if ( cat_state & DOG_BARKING ) {} // Wrong bit type +#endif +#ifdef ERROR3 + if ( cat_state & CAT_SLEEPING == 0 ) {} // Operator precedence +#endif +#ifdef ERROR4 + if ( dog_state && DOG_BARKING ) {} // Logical && +#endif + if ( dog_state & DOG_BARKING ) {} // OK +#ifdef ERROR5 + Cat_state state0 = 0; // Conversion from non-safe bits +#endif + + Cat_state state = CAT_NO_STATE; // OK + assert( !state ); + state = ~state; + assert( state ); + assert( state != CAT_NO_STATE ); + assert( state & CAT_SLEEPING ); + assert( state & CAT_PURRING ); + assert( state & CAT_PLAYING ); + state = CAT_SLEEPING; + assert( state == cat_state ); + assert( state.size() == 8 * sizeof( unsigned int ) ); + assert( sizeof( Cat_state ) == sizeof( unsigned int ) ); + + dog_state = DOG_BARKING; +#ifdef ERROR6 + if ( dog_state == cat_state ) {} // Don't allow comparison of different types. +#endif + + +/// @note All These assertions are inside #ifdef sections because they +/// compare either Safe_bit_field or Safe_bit_const to literal integers. +/// If you compile any of these assertions they should generate errors. +/// These #ifdef sections exhaustively demonstrate that all possible +/// operations and comparisons with literal values are forbidden. + +#ifdef ERROR7 + assert( dog_state == 1 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR8 + assert( dog_state != 2 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR9 + assert( dog_state < 2 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR10 + assert( dog_state > 0 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR11 + assert( dog_state <= 1 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR12 + assert( dog_state >= 1 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR13 + assert( DOG_BARKING == 1 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR14 + assert( DOG_BARKING != 2 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR15 + assert( DOG_BARKING < 2 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR16 + assert( DOG_BARKING > 0 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR17 + assert( DOG_BARKING <= 1 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR18 + assert( DOG_BARKING >= 1 ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR19 + assert( ( dog_state | 1 ) != 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR20 + assert( ( dog_state & 2 ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR21 + assert( ( dog_state ^ 1 ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR22 + assert( ( dog_state |= 2 ) == 3 ); // Don't allow operations with integers. +#endif +#ifdef ERROR23 + assert( ( dog_state &= 3 ) == 2 ); // Don't allow operations with integers. +#endif +#ifdef ERROR24 + assert( ( dog_state ^= 1 ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR25 + assert( ( DOG_BARKING | 1 ) != 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR26 + assert( ( DOG_BARKING & 2 ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR27 + assert( ( DOG_BARKING ^ 1 ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR28 + assert( ( DOG_BARKING |= 2 ) == 3 ); // Don't allow operations with integers. +#endif +#ifdef ERROR29 + assert( ( DOG_BARKING &= 3 ) == 2 ); // Don't allow operations with integers. +#endif +#ifdef ERROR30 + assert( ( DOG_BARKING ^= 1 ) == 0 ); // Don't allow operations with integers. +#endif + + +/// @note All These assertions are inside #ifdef sections because they +/// compare either Safe_bit_field or Safe_bit_const to an int variable. +/// If you compile any of these assertions they should generate errors. +/// These #ifdef sections exhaustively demonstrate that all possible +/// operations and comparisons with integers are forbidden. + + int value = 1; + (void)value; +#ifdef ERROR31 + assert( dog_state == value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR32 + value = 2; + assert( dog_state != value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR33 + value = 2; + assert( dog_state < value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR34 + value = 0; + assert( dog_state > value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR35 + value = 1; + assert( dog_state <= value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR36 + value = 1; + assert( dog_state >= value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR37 + value = 1; + assert( DOG_BARKING == value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR38 + value = 2; + assert( DOG_BARKING != value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR39 + value = 2; + assert( DOG_BARKING < value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR40 + value = 0; + assert( DOG_BARKING > value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR41 + value = 1; + assert( DOG_BARKING <= value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR42 + value = 1; + assert( DOG_BARKING >= value ); // Don't allow comparisons to integers. +#endif +#ifdef ERROR43 + value = 1; + assert( ( dog_state | value ) != 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR44 + value = 2; + assert( ( dog_state & value ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR45 + value = 1; + assert( ( dog_state ^ value ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR46 + value = 2; + assert( ( dog_state |= value ) == 3 ); // Don't allow operations with integers. +#endif +#ifdef ERROR47 + value = 3; + assert( ( dog_state &= value ) == 2 ); // Don't allow operations with integers. +#endif +#ifdef ERROR48 + value = 1; + assert( ( dog_state ^= value ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR49 + value = 1; + assert( ( DOG_BARKING | value ) != 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR50 + value = 2; + assert( ( DOG_BARKING & value ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR51 + value = 1; + assert( ( DOG_BARKING ^ value ) == 0 ); // Don't allow operations with integers. +#endif +#ifdef ERROR52 + value = 2; + assert( ( DOG_BARKING |= value ) == 3 ); // Don't allow operations with integers. +#endif +#ifdef ERROR53 + value = 3; + assert( ( DOG_BARKING &= value ) == 2 ); // Don't allow operations with integers. +#endif +#ifdef ERROR54 + value = 1; + assert( ( DOG_BARKING ^= value ) == 0 ); // Don't allow operations with integers. +#endif + + + dog_state |= DOG_CHEWING; + assert( dog_state & ( DOG_CHEWING | DOG_BARKING ) ); + dog_state &= DOG_CHEWING; + assert( dog_state == DOG_CHEWING ); + dog_state = ~dog_state; + assert( dog_state != DOG_CHEWING ); + dog_state = ~dog_state; + assert( dog_state == DOG_CHEWING ); + + cout << "If nothing asserted, then all tests passed!" << endl; + return 0; +} Added: trunk/test/SafeBits/SafeBits.cbp =================================================================== --- trunk/test/SafeBits/SafeBits.cbp (rev 0) +++ trunk/test/SafeBits/SafeBits.cbp 2009-01-20 07:25:36 UTC (rev 918) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="SafeBits" /> + <Option pch_mode="2" /> + <Option compiler="cygwin" /> + <Build> + <Target title="Debug"> + <Option output="obj\Debug\SafeBits" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug\" /> + <Option type="1" /> + <Option compiler="cygwin" /> + <Compiler> + <Add option="-Wall" /> + <Add option="-g" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Release"> + <Option output="obj\Release\SafeBits" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release\" /> + <Option type="1" /> + <Option compiler="cygwin" /> + <Compiler> + <Add option="-Os" /> + <Add option="-Wall" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + </Build> + <Unit filename="SafeBitTest.cpp" /> + <Extensions> + <code_completion /> + <envvars /> + <debugger /> + </Extensions> + </Project> +</CodeBlocks_project_file> Added: trunk/test/SafeBits/SafeBits.vcproj =================================================================== --- trunk/test/SafeBits/SafeBits.vcproj (rev 0) +++ trunk/test/SafeBits/SafeBits.vcproj 2009-01-20 07:25:36 UTC (rev 918) @@ -0,0 +1,176 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="SafeBits" + ProjectGUID="{ECD7ED50-B99D-44BE-BA38-E17D6110C3E5}" + RootNamespace="SafeBits" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\include" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + WarningLevel="4" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(ProjectDir)\$(IntDir)\$(ProjectName).exe" + GenerateDebugInformation="true" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\..\include" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + WarningLevel="4" + DebugInformationFormat="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(ProjectDir)\$(IntDir)\$(ProjectName).exe" + GenerateDebugInformation="true" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\SafeBitTest.cpp" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2009-10-10 23:11:37
|
Revision: 1031 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1031&view=rev Author: rich_sposato Date: 2009-10-10 23:11:31 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Changed main declaration to remove GCC warning. Modified Paths: -------------- trunk/test/CheckReturn/main.cpp trunk/test/Checker/main.cpp Modified: trunk/test/CheckReturn/main.cpp =================================================================== --- trunk/test/CheckReturn/main.cpp 2009-10-10 23:09:23 UTC (rev 1030) +++ trunk/test/CheckReturn/main.cpp 2009-10-10 23:11:31 UTC (rev 1031) @@ -1,12 +1,12 @@ //////////////////////////////////////////////////////////////////////////////// // The Loki Library // Copyright (c) 2007 Rich Sposato -// Permission to use, copy, modify, distribute and sell this software for any -// purpose is hereby granted without fee, provided that the above copyright -// notice appear in all copies and that both that copyright notice and this +// Permission to use, copy, modify, distribute and sell this software for any +// purpose is hereby granted without fee, provided that the above copyright +// notice appear in all copies and that both that copyright notice and this // permission notice appear in supporting documentation. -// The author makes no representations about the -// suitability of this software for any purpose. It is provided "as is" +// The author makes no representations about the +// suitability of this software for any purpose. It is provided "as is" // without express or implied warranty. //////////////////////////////////////////////////////////////////////////////// @@ -88,7 +88,7 @@ // ---------------------------------------------------------------------------- -int main( unsigned int argc, const char * argv[] ) +int main( int argc, const char * argv[] ) { if ( 2 == argc ) Modified: trunk/test/Checker/main.cpp =================================================================== --- trunk/test/Checker/main.cpp 2009-10-10 23:09:23 UTC (rev 1030) +++ trunk/test/Checker/main.cpp 2009-10-10 23:11:31 UTC (rev 1031) @@ -355,7 +355,7 @@ // ---------------------------------------------------------------------------- -int main( unsigned int argc, const char * const argv[] ) +int main( int argc, const char * const argv[] ) { (void)argc; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2009-10-10 23:46:08
|
Revision: 1033 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1033&view=rev Author: rich_sposato Date: 2009-10-10 23:45:58 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Added new configurations to differentiate between cygwin-gcc and gnu-gcc. Modified Paths: -------------- trunk/test/Pimpl/Pimpl.cbp trunk/test/Register/Register.cbp trunk/test/flex_string/flex_string.cbp Modified: trunk/test/Pimpl/Pimpl.cbp =================================================================== --- trunk/test/Pimpl/Pimpl.cbp 2009-10-10 23:43:02 UTC (rev 1032) +++ trunk/test/Pimpl/Pimpl.cbp 2009-10-10 23:45:58 UTC (rev 1033) @@ -5,10 +5,42 @@ <Option title="Pimpl" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\Pimpl" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\Pimpl" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\Pimpl" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\Pimpl" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="bin\Release\Pimpl" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\Pimpl" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> Modified: trunk/test/Register/Register.cbp =================================================================== --- trunk/test/Register/Register.cbp 2009-10-10 23:43:02 UTC (rev 1032) +++ trunk/test/Register/Register.cbp 2009-10-10 23:45:58 UTC (rev 1033) @@ -5,10 +5,42 @@ <Option title="Register" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\Register" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\Register" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\Register" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\Register" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="bin\Release\Register" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\Register" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> Modified: trunk/test/flex_string/flex_string.cbp =================================================================== --- trunk/test/flex_string/flex_string.cbp 2009-10-10 23:43:02 UTC (rev 1032) +++ trunk/test/flex_string/flex_string.cbp 2009-10-10 23:45:58 UTC (rev 1033) @@ -5,10 +5,44 @@ <Option title="flex_string" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\flex_string" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\flex_string" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + <Add directory="..\..\include\loki\flex" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\flex_string" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + <Add directory="..\..\include\loki\flex" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\flex_string" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -18,12 +52,12 @@ <Add directory="..\..\include\loki\flex" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="obj\Release\flex_string" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\flex_string" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -36,7 +70,7 @@ <Add directory="..\..\include\loki\flex" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2009-10-10 23:48:03
|
Revision: 1034 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1034&view=rev Author: rich_sposato Date: 2009-10-10 23:47:49 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Added new configurations to differentiate between cygwin-gcc and gnu-gcc. Modified Paths: -------------- trunk/test/Function/Function.cbp trunk/test/LevelMutex/LevelMutex.cbp trunk/test/SafeFormat/SafeFormat.cbp Modified: trunk/test/Function/Function.cbp =================================================================== --- trunk/test/Function/Function.cbp 2009-10-10 23:45:58 UTC (rev 1033) +++ trunk/test/Function/Function.cbp 2009-10-10 23:47:49 UTC (rev 1034) @@ -5,10 +5,36 @@ <Option title="Function" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\Function" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\Function" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\Function" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include" /> + <Add directory="..\..\include\loki" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\Function" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,9 +43,9 @@ <Add directory="..\..\include" /> </Compiler> </Target> - <Target title="Release"> - <Option output="obj\Release\Function" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\Function" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> Modified: trunk/test/LevelMutex/LevelMutex.cbp =================================================================== --- trunk/test/LevelMutex/LevelMutex.cbp 2009-10-10 23:45:58 UTC (rev 1033) +++ trunk/test/LevelMutex/LevelMutex.cbp 2009-10-10 23:47:49 UTC (rev 1034) @@ -5,10 +5,44 @@ <Option title="LevelMutex" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\LevelMutex" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\LevelMutex" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include" /> + <Add directory="..\..\include\loki" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + <Add library="..\..\..\PThreads\lib\pthreadVC2.lib" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\LevelMutex" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include" /> + <Add directory="..\..\include\loki" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + <Add library="..\..\..\PThreads\lib\pthreadVC2.lib" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\LevelMutex" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +51,13 @@ <Add directory="..\..\include\loki" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> + <Add library="..\..\..\PThreads\lib\pthreadVC2.lib" /> </Linker> </Target> - <Target title="Release"> - <Option output="obj\Release\LevelMutex" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\LevelMutex" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +69,8 @@ <Add directory="..\..\include\loki" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> + <Add library="..\..\..\PThreads\lib\pthreadVC2.lib" /> </Linker> </Target> </Build> Modified: trunk/test/SafeFormat/SafeFormat.cbp =================================================================== --- trunk/test/SafeFormat/SafeFormat.cbp 2009-10-10 23:45:58 UTC (rev 1033) +++ trunk/test/SafeFormat/SafeFormat.cbp 2009-10-10 23:47:49 UTC (rev 1034) @@ -5,10 +5,42 @@ <Option title="SafeFormat" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\SafeFormat" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\SafeFormat" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\SafeFormat" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\SafeFormat" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="bin\Release\SafeFormat" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\SafeFormat" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2009-10-10 23:49:45
|
Revision: 1035 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1035&view=rev Author: rich_sposato Date: 2009-10-10 23:49:40 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Added new configurations to differentiate between cygwin-gcc and gnu-gcc. Modified Paths: -------------- trunk/test/CachedFactory/CachedFactory.cbp trunk/test/OrderedStatic/OrderedStatic.cbp trunk/test/ScopeGuard/ScopeGuard.cbp Modified: trunk/test/CachedFactory/CachedFactory.cbp =================================================================== --- trunk/test/CachedFactory/CachedFactory.cbp 2009-10-10 23:47:49 UTC (rev 1034) +++ trunk/test/CachedFactory/CachedFactory.cbp 2009-10-10 23:49:40 UTC (rev 1035) @@ -5,10 +5,42 @@ <Option title="CachedFactory" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\CachedFactory" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\CachedFactory" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\CachedFactory" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\CachedFactory" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="obj\Release\CachedFactory" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\CachedFactory" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> Modified: trunk/test/OrderedStatic/OrderedStatic.cbp =================================================================== --- trunk/test/OrderedStatic/OrderedStatic.cbp 2009-10-10 23:47:49 UTC (rev 1034) +++ trunk/test/OrderedStatic/OrderedStatic.cbp 2009-10-10 23:49:40 UTC (rev 1035) @@ -5,10 +5,42 @@ <Option title="OrderedStatic" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\OrderedStatic" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\OrderedStatic" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\OrderedStatic" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\OrderedStatic" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="bin\Release\OrderedStatic" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\OrderedStatic" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> Modified: trunk/test/ScopeGuard/ScopeGuard.cbp =================================================================== --- trunk/test/ScopeGuard/ScopeGuard.cbp 2009-10-10 23:47:49 UTC (rev 1034) +++ trunk/test/ScopeGuard/ScopeGuard.cbp 2009-10-10 23:49:40 UTC (rev 1035) @@ -5,10 +5,36 @@ <Option title="ScopeGuard" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\ScopeGuard" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\ScopeGuard" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\ScopeGuard" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\ScopeGuard" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,9 +43,9 @@ <Add directory="..\..\include" /> </Compiler> </Target> - <Target title="Release"> - <Option output="bin\Release\ScopeGuard" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\ScopeGuard" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2009-10-10 23:51:35
|
Revision: 1036 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1036&view=rev Author: rich_sposato Date: 2009-10-10 23:51:27 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Added new configurations to differentiate between cygwin-gcc and gnu-gcc. Modified Paths: -------------- trunk/test/SafeBits/SafeBits.cbp trunk/test/Singleton/Singleton.cbp trunk/test/Visitor/Visitor.cbp Modified: trunk/test/SafeBits/SafeBits.cbp =================================================================== --- trunk/test/SafeBits/SafeBits.cbp 2009-10-10 23:49:40 UTC (rev 1035) +++ trunk/test/SafeBits/SafeBits.cbp 2009-10-10 23:51:27 UTC (rev 1036) @@ -6,10 +6,32 @@ <Option pch_mode="2" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\SafeBits" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\SafeBits" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-Wall" /> + <Add option="-g" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\SafeBits" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-Os" /> + <Add option="-Wall" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\SafeBits" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-Wall" /> @@ -17,9 +39,9 @@ <Add directory="..\..\include" /> </Compiler> </Target> - <Target title="Release"> - <Option output="obj\Release\SafeBits" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\SafeBits" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> Modified: trunk/test/Singleton/Singleton.cbp =================================================================== --- trunk/test/Singleton/Singleton.cbp 2009-10-10 23:49:40 UTC (rev 1035) +++ trunk/test/Singleton/Singleton.cbp 2009-10-10 23:51:27 UTC (rev 1036) @@ -5,10 +5,42 @@ <Option title="Singleton" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\Singleton" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\Singleton" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\Singleton" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\Singleton" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="bin\Release\Singleton" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\Singleton" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> Modified: trunk/test/Visitor/Visitor.cbp =================================================================== --- trunk/test/Visitor/Visitor.cbp 2009-10-10 23:49:40 UTC (rev 1035) +++ trunk/test/Visitor/Visitor.cbp 2009-10-10 23:51:27 UTC (rev 1036) @@ -5,10 +5,36 @@ <Option title="Visitor" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\Visitor" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\Visitor" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\Visitor" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\Visitor" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,9 +43,9 @@ <Add directory="..\..\include" /> </Compiler> </Target> - <Target title="Release"> - <Option output="bin\Release\Visitor" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\Visitor" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2009-10-10 23:53:16
|
Revision: 1037 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1037&view=rev Author: rich_sposato Date: 2009-10-10 23:53:07 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Added new configurations to differentiate between cygwin-gcc and gnu-gcc. Modified Paths: -------------- trunk/test/DeletableSingleton/DeletableSingleton.cbp trunk/test/SmallObj/DefaultAlloc.cbp trunk/test/SmallObj/SmallObj.cbp Modified: trunk/test/DeletableSingleton/DeletableSingleton.cbp =================================================================== --- trunk/test/DeletableSingleton/DeletableSingleton.cbp 2009-10-10 23:51:27 UTC (rev 1036) +++ trunk/test/DeletableSingleton/DeletableSingleton.cbp 2009-10-10 23:53:07 UTC (rev 1037) @@ -5,10 +5,36 @@ <Option title="DeletableSingleton" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\DeletableSingleton" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\DeletableSingleton" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include" /> + <Add directory="..\..\include\loki" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\DeletableSingleton" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\DeletableSingleton" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,9 +43,9 @@ <Add directory="..\..\include\loki" /> </Compiler> </Target> - <Target title="Release"> - <Option output="obj\Release\DeletableSingleton" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\DeletableSingleton" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> Modified: trunk/test/SmallObj/DefaultAlloc.cbp =================================================================== --- trunk/test/SmallObj/DefaultAlloc.cbp 2009-10-10 23:51:27 UTC (rev 1036) +++ trunk/test/SmallObj/DefaultAlloc.cbp 2009-10-10 23:53:07 UTC (rev 1037) @@ -5,10 +5,36 @@ <Option title="DefaultAlloc" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\DefaultAlloc" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\DefaultAlloc" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include" /> + <Add directory="..\..\include\loki" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\DefaultAlloc" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\DefaultAlloc" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,9 +43,9 @@ <Add directory="..\..\include\loki" /> </Compiler> </Target> - <Target title="Release"> - <Option output="bin\Release\DefaultAlloc" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\DefaultAlloc" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> Modified: trunk/test/SmallObj/SmallObj.cbp =================================================================== --- trunk/test/SmallObj/SmallObj.cbp 2009-10-10 23:51:27 UTC (rev 1036) +++ trunk/test/SmallObj/SmallObj.cbp 2009-10-10 23:53:07 UTC (rev 1037) @@ -5,10 +5,42 @@ <Option title="SmallObj" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\SmallObj" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\SmallObj" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\SmallObj" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include" /> + <Add directory="..\..\include\loki" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\SmallObj" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="bin\Release\SmallObj" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\SmallObj" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include\loki" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2009-10-10 23:55:04
|
Revision: 1038 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1038&view=rev Author: rich_sposato Date: 2009-10-10 23:54:57 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Added new configurations to differentiate between cygwin-gcc and gnu-gcc. Modified Paths: -------------- trunk/test/Checker/Checker.cbp trunk/test/Factory/Factory.cbp trunk/test/LockingPtr/LockingPtr.cbp Modified: trunk/test/Checker/Checker.cbp =================================================================== --- trunk/test/Checker/Checker.cbp 2009-10-10 23:53:07 UTC (rev 1037) +++ trunk/test/Checker/Checker.cbp 2009-10-10 23:54:57 UTC (rev 1038) @@ -5,10 +5,36 @@ <Option title="Checker" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\Checker" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\Checker" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\Checker" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\Checker" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,9 +43,9 @@ <Add directory="..\..\include" /> </Compiler> </Target> - <Target title="Release"> - <Option output="obj\Release\Checker" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\Checker" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> Modified: trunk/test/Factory/Factory.cbp =================================================================== --- trunk/test/Factory/Factory.cbp 2009-10-10 23:53:07 UTC (rev 1037) +++ trunk/test/Factory/Factory.cbp 2009-10-10 23:54:57 UTC (rev 1038) @@ -5,10 +5,42 @@ <Option title="Factory" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\Factory" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\Factory" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\Factory" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\Factory" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="obj\Release\Factory" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\Factory" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> Modified: trunk/test/LockingPtr/LockingPtr.cbp =================================================================== --- trunk/test/LockingPtr/LockingPtr.cbp 2009-10-10 23:53:07 UTC (rev 1037) +++ trunk/test/LockingPtr/LockingPtr.cbp 2009-10-10 23:54:57 UTC (rev 1038) @@ -5,10 +5,42 @@ <Option title="LockingPtr" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> - <Option output="obj\Debug\LockingPtr" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\LockingPtr" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\LockingPtr" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="obj\Debug_Cygwin\LockingPtr" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="obj\Release\LockingPtr" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="obj\Release_Cygwin\LockingPtr" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2009-10-10 23:56:35
|
Revision: 1039 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1039&view=rev Author: rich_sposato Date: 2009-10-10 23:56:26 +0000 (Sat, 10 Oct 2009) Log Message: ----------- Added new configurations to differentiate between cygwin-gcc and gnu-gcc. Modified Paths: -------------- trunk/test/CheckReturn/CheckReturn.cbp trunk/test/SmartPtr/SmartPtr.cbp Modified: trunk/test/CheckReturn/CheckReturn.cbp =================================================================== --- trunk/test/CheckReturn/CheckReturn.cbp 2009-10-10 23:54:57 UTC (rev 1038) +++ trunk/test/CheckReturn/CheckReturn.cbp 2009-10-10 23:56:26 UTC (rev 1039) @@ -5,9 +5,35 @@ <Option title="CheckReturn" /> <Option compiler="cygwin" /> <Build> - <Target title="Debug"> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\CheckReturn" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\CheckReturn" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Debug_Cygwin"> <Option output="obj\Debug\CheckReturn" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Option object_output="obj\Debug_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -17,9 +43,9 @@ <Add directory="..\..\include" /> </Compiler> </Target> - <Target title="Release"> + <Target title="Release_Cygwin"> <Option output="obj\Release\CheckReturn" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> Modified: trunk/test/SmartPtr/SmartPtr.cbp =================================================================== --- trunk/test/SmartPtr/SmartPtr.cbp 2009-10-10 23:54:57 UTC (rev 1038) +++ trunk/test/SmartPtr/SmartPtr.cbp 2009-10-10 23:56:26 UTC (rev 1039) @@ -3,12 +3,44 @@ <FileVersion major="1" minor="6" /> <Project> <Option title="SmartPtr" /> - <Option compiler="cygwin" /> + <Option compiler="gcc" /> <Build> - <Target title="Debug"> - <Option output="bin\Debug\SmartPtr" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Debug\" /> + <Target title="Debug_GCC"> + <Option output="bin\Debug_GCC\SmartPtr" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki_D.a" /> + </Linker> + </Target> + <Target title="Release_GCC"> + <Option output="bin\Release_GCC\SmartPtr" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-fexpensive-optimizations" /> + <Add option="-Os" /> + <Add option="-O3" /> + <Add option="-W" /> + <Add directory="..\..\include\loki" /> + <Add directory="..\..\include" /> + </Compiler> + <Linker> + <Add library="..\..\lib\GCC\Loki.a" /> + </Linker> + </Target> + <Target title="Debug_Cygwin"> + <Option output="bin\Debug_Cygwin\SmartPtr" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_Cygwin\" /> + <Option type="1" /> <Option compiler="cygwin" /> <Compiler> <Add option="-W" /> @@ -17,12 +49,12 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki_D.a" /> + <Add library="..\..\lib\Cygwin\Loki_D.a" /> </Linker> </Target> - <Target title="Release"> - <Option output="bin\Release\SmartPtr" prefix_auto="1" extension_auto="1" /> - <Option object_output="obj\Release\" /> + <Target title="Release_Cygwin"> + <Option output="bin\Release_Cygwin\SmartPtr" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_Cygwin\" /> <Option type="1" /> <Option compiler="cygwin" /> <Compiler> @@ -34,7 +66,7 @@ <Add directory="..\..\include" /> </Compiler> <Linker> - <Add library="..\..\lib\Loki.a" /> + <Add library="..\..\lib\Cygwin\Loki.a" /> </Linker> </Target> </Build> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2009-11-20 06:33:24
|
Revision: 1055 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1055&view=rev Author: rich_sposato Date: 2009-11-20 06:33:15 +0000 (Fri, 20 Nov 2009) Log Message: ----------- Added ThreadLocal test project to Loki. Added Paths: ----------- trunk/test/ThreadLocal/ trunk/test/ThreadLocal/ThreadLocal.cbp trunk/test/ThreadLocal/ThreadLocal.vcproj trunk/test/ThreadLocal/main.cpp Added: trunk/test/ThreadLocal/ThreadLocal.cbp =================================================================== --- trunk/test/ThreadLocal/ThreadLocal.cbp (rev 0) +++ trunk/test/ThreadLocal/ThreadLocal.cbp 2009-11-20 06:33:15 UTC (rev 1055) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="ThreadLocal" /> + <Option pch_mode="2" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug_GCC"> + <Option output="obj\Debug_GCC\ThreadLocal" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Debug_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-Wmain" /> + <Add option="-pedantic" /> + <Add option="-W" /> + <Add option="-g" /> + <Add directory="..\..\include" /> + </Compiler> + </Target> + <Target title="Release_GCC"> + <Option output="obj\Release_GCC\ThreadLocal" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj\Release_GCC\" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-O2" /> + </Compiler> + <Linker> + <Add option="-s" /> + </Linker> + </Target> + </Build> + <Compiler> + <Add option="-Wall" /> + <Add option="-fexceptions" /> + </Compiler> + <Unit filename="main.cpp" /> + <Extensions> + <code_completion /> + <debugger /> + <lib_finder disable_auto="1" /> + </Extensions> + </Project> +</CodeBlocks_project_file> Added: trunk/test/ThreadLocal/ThreadLocal.vcproj =================================================================== --- trunk/test/ThreadLocal/ThreadLocal.vcproj (rev 0) +++ trunk/test/ThreadLocal/ThreadLocal.vcproj 2009-11-20 06:33:15 UTC (rev 1055) @@ -0,0 +1,188 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="ThreadLocal" + ProjectGUID="{27CB0BB1-1754-46AB-A8C6-697D1B9B9C41}" + RootNamespace="ThreadLocal" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../include" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + StringPooling="true" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(ProjectDir)\$(ConfigurationName)\$(ProjectName).exe" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="0" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="4" + DebugInformationFormat="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(ProjectDir)\$(ConfigurationName)\$(ProjectName).exe" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\main.cpp" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: trunk/test/ThreadLocal/main.cpp =================================================================== --- trunk/test/ThreadLocal/main.cpp (rev 0) +++ trunk/test/ThreadLocal/main.cpp 2009-11-20 06:33:15 UTC (rev 1055) @@ -0,0 +1,398 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// ThreadLocal test program for The Loki Library +// Copyright (c) 2009 by Richard Sposato +// The copyright on this file is protected under the terms of the MIT license. +// +// Permission to use, copy, modify, distribute and sell this software for any +// purpose is hereby granted without fee, provided that the above copyright +// notice appear in all copies and that both that copyright notice and this +// permission notice appear in supporting documentation. +// +// The author makes no representations about the suitability of this software +// for any purpose. It is provided "as is" without express or implied warranty. +// +//////////////////////////////////////////////////////////////////////////////// + +// $Id$ + + +// ---------------------------------------------------------------------------- + +#include <loki/ThreadLocal.h> +#include <loki/Threads.h> + +#include <vector> +#include <sstream> +#include <iostream> + + +using namespace ::std; + +#if !defined( NULL ) + #define NULL 0 +#endif + +// define nullptr even though new compilers will have this keyword just so we +// have a consistent and easy way of identifying which uses of 0 mean null. +#if !defined( nullptr ) + #define nullptr NULL +#endif + +#if defined(_WIN32) + + #include <process.h> + #include <windows.h> + + typedef unsigned int ( WINAPI * ThreadFunction_ )( void * ); + + #define LOKI_pthread_t HANDLE + + #define LOKI_pthread_create( handle, attr, func, arg ) \ + ( int )( ( *handle = ( HANDLE ) _beginthreadex ( NULL, 0, ( ThreadFunction_ )func, arg, 0, NULL ) ) == NULL ) + + #define LOKI_pthread_join( thread ) \ + ( ( WaitForSingleObject( ( thread ), INFINITE ) != WAIT_OBJECT_0 ) || !CloseHandle( thread ) ) + +#else + + #define LOKI_pthread_t \ + pthread_t + #define LOKI_pthread_create(handle,attr,func,arg) \ + pthread_create(handle,attr,func,arg) + #define LOKI_pthread_join(thread) \ + pthread_join(thread, NULL) + +#endif + +// ---------------------------------------------------------------------------- + +class Thread +{ +public: + + typedef void * ( * CallFunction )( void * ); + + Thread( CallFunction func, void * parm ) + : pthread_() + , func_( func ) + , parm_( parm ) + { + } + + void AssignTask( CallFunction func, void * parm ) + { + func_ = func; + parm_ = parm; + } + + int Start( void ) + { + return LOKI_pthread_create( &pthread_, NULL, func_, parm_ ); + } + + int WaitForThread( void ) const + { + return LOKI_pthread_join( pthread_ ); + } + +private: + LOKI_pthread_t pthread_; + CallFunction func_; + void * parm_; +}; + +// ---------------------------------------------------------------------------- + +class ThreadPool +{ +public: + ThreadPool( void ) : m_threads() + { + } + + void Create( size_t threadCount, Thread::CallFunction function ) + { + for( size_t ii = 0; ii < threadCount; ii++ ) + { + stringstream buffer; + buffer << "Creating thread " << ii << endl; + cout << buffer.rdbuf(); + Thread * thread = new Thread( function, + reinterpret_cast< void * >( ii + 1 ) ); + m_threads.push_back( thread ); + } + } + + void Start( void ) + { + for ( size_t ii = 0; ii < m_threads.size(); ii++ ) + { + stringstream buffer; + buffer << "Starting thread " << ii << endl; + cout << buffer.rdbuf(); + m_threads.at( ii )->Start(); + } + } + + void Join( void ) const + { + for ( size_t ii = 0; ii < m_threads.size(); ii++ ) + m_threads.at( ii )->WaitForThread(); + } + + ~ThreadPool( void ) + { + for ( size_t ii = 0; ii < m_threads.size(); ii++ ) + { + delete m_threads.at(ii); + } + } + +private: + typedef std::vector< Thread * > Threads; + + Threads m_threads; +}; + +// ---------------------------------------------------------------------------- + +typedef ::std::vector< unsigned int > IntVector; + +static LOKI_THREAD_LOCAL unsigned int StandaloneStaticValue = 0; + +static const unsigned int ThreadCount = 4; + +// ---------------------------------------------------------------------------- + +IntVector & GetIntVector( void ) +{ + unsigned int v = 0; + static IntVector addresses( ThreadCount, v ); + return addresses; +} + +// ---------------------------------------------------------------------------- + +void * AddToIntVector( void * p ) +{ + assert( 0 == StandaloneStaticValue ); + const unsigned int ii = reinterpret_cast< unsigned int >( p ); + assert( 0 < ii ); + assert( ii < ThreadCount + 1 ); + StandaloneStaticValue = ii; + IntVector & v = GetIntVector(); + v[ ii - 1 ] = StandaloneStaticValue; + assert( ii == StandaloneStaticValue ); + assert( v[ ii - 1 ] == StandaloneStaticValue ); + return nullptr; +} + +// ---------------------------------------------------------------------------- + +bool TestThreadLocalStaticValue( void ) +{ + assert( StandaloneStaticValue == 0 ); + { + ThreadPool pool; + pool.Create( ThreadCount, &AddToIntVector ); + pool.Start(); + pool.Join(); + } + + bool allDifferent = true; + IntVector & v = GetIntVector(); + for ( unsigned int i1 = 0; i1 < ThreadCount - 1; ++i1 ) + { + const unsigned int v1 = v[ i1 ]; + for ( unsigned int i2 = i1 + 1; i2 < ThreadCount; ++i2 ) + { + const unsigned int v2 = v[ i2 ]; + if ( v1 == v2 ) + { + allDifferent = false; + break; + } + } + if ( !allDifferent ) + break; + } + assert( StandaloneStaticValue == 0 ); + + return allDifferent; +} + +// ---------------------------------------------------------------------------- + +unsigned int & GetFunctionThreadLocalValue( void ) +{ + static LOKI_THREAD_LOCAL unsigned int FunctionStaticValue = 0; + return FunctionStaticValue; +} + +// ---------------------------------------------------------------------------- + +void * ChangeFunctionStaticValue( void * p ) +{ + unsigned int & thatValue = GetFunctionThreadLocalValue(); + assert( 0 == thatValue ); + const unsigned int ii = reinterpret_cast< unsigned int >( p ); + assert( 0 < ii ); + assert( ii < ThreadCount + 1 ); + thatValue = ii + ThreadCount; + IntVector & v = GetIntVector(); + v[ ii - 1 ] = thatValue + ThreadCount; + assert( ii + ThreadCount == thatValue ); + assert( v[ ii - 1 ] == thatValue + ThreadCount ); + return nullptr; +} + +// ---------------------------------------------------------------------------- + +bool TestThreadLocalFunctionStaticValue( void ) +{ + assert( GetFunctionThreadLocalValue() == 0 ); + + IntVector & v = GetIntVector(); + for ( unsigned int i0 = 0; i0 < v.size(); ++i0 ) + { + v[ i0 ] = 0; + } + + { + ThreadPool pool; + pool.Create( ThreadCount, &ChangeFunctionStaticValue ); + pool.Start(); + pool.Join(); + } + + bool allDifferent = true; + for ( unsigned int i1 = 0; i1 < ThreadCount - 1; ++i1 ) + { + const unsigned int v1 = v[ i1 ]; + for ( unsigned int i2 = i1 + 1; i2 < ThreadCount; ++i2 ) + { + const unsigned int v2 = v[ i2 ]; + if ( v1 == v2 ) + { + allDifferent = false; + break; + } + } + if ( !allDifferent ) + break; + } + assert( GetFunctionThreadLocalValue() == 0 ); + + return allDifferent; +} + +// ---------------------------------------------------------------------------- + +class ThreadAware +{ +public: + + static inline void SetValue( unsigned int value ) { ClassThreadLocal = value; } + + static inline unsigned int GetValue( void ) { return ClassThreadLocal; } + +private: + + static LOKI_THREAD_LOCAL unsigned int ClassThreadLocal; + +}; + +LOKI_THREAD_LOCAL unsigned int ThreadAware::ClassThreadLocal = 0; + +// ---------------------------------------------------------------------------- + +void * ChangeClassStaticValue( void * p ) +{ + assert( ThreadAware::GetValue() == 0 ); + const unsigned int ii = reinterpret_cast< unsigned int >( p ); + assert( 0 < ii ); + assert( ii < ThreadCount + 1 ); + ThreadAware::SetValue( ii + 2 * ThreadCount ); + IntVector & v = GetIntVector(); + v[ ii - 1 ] = ThreadAware::GetValue(); + assert( v[ ii - 1 ] == ThreadAware::GetValue() ); + assert( ThreadAware::GetValue() == ii + 2 * ThreadCount ); + return nullptr; +} + +// ---------------------------------------------------------------------------- + +bool TestThreadLocalClassStaticValue( void ) +{ + assert( ThreadAware::GetValue() == 0 ); + + IntVector & v = GetIntVector(); + for ( unsigned int i0 = 0; i0 < v.size(); ++i0 ) + { + v[ i0 ] = 0; + } + + { + ThreadPool pool; + pool.Create( ThreadCount, &ChangeClassStaticValue ); + pool.Start(); + pool.Join(); + } + + bool allDifferent = true; + for ( unsigned int i1 = 0; i1 < ThreadCount - 1; ++i1 ) + { + const unsigned int v1 = v[ i1 ]; + for ( unsigned int i2 = i1 + 1; i2 < ThreadCount; ++i2 ) + { + const unsigned int v2 = v[ i2 ]; + if ( v1 == v2 ) + { + allDifferent = false; + break; + } + } + if ( !allDifferent ) + break; + } + assert( ThreadAware::GetValue() == 0 ); + + return allDifferent; +} + +// ---------------------------------------------------------------------------- + +int main( int argc, const char * const argv[] ) +{ + bool okay = true; + cout << "Starting ThreadLocal tests." << endl; + cout << "If any tests fail, or any assertions fail," << endl + << "then your compiler does not implement thread_local storage correctly." << endl; + + cout << endl << "Testing static thread_local storage inside classes." << endl; + okay = TestThreadLocalClassStaticValue(); + if ( okay ) + cout << "Your compiler correctly implements thread_local storage for class static values." << endl; + else + cout << "Your compiler does not properly implement thread_local storage for class static values." << endl; + + cout << endl << "Testing static thread_local storage inside functions." << endl; + okay = TestThreadLocalFunctionStaticValue(); + if ( okay ) + cout << "Your compiler correctly implements thread_local storage for function static values." << endl; + else + cout << "Your compiler does not properly implement thread_local storage for function static values." << endl; + + cout << endl << "Testing standalone static thread_local storage." << endl; + okay = TestThreadLocalStaticValue(); + if ( okay ) + cout << "Your compiler correctly implements thread_local storage for standalone static values." << endl; + else + cout << "Your compiler does not properly implement thread_local storage for standalone static values." << endl; + + ::system( "pause" ); + return 0; +} + +// ---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2011-09-29 23:31:53
|
Revision: 1121 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1121&view=rev Author: rich_sposato Date: 2011-09-29 23:31:47 +0000 (Thu, 29 Sep 2011) Log Message: ----------- Added tests for ObjectLevelLockable and ClassLevelLockable. Added Paths: ----------- trunk/test/Lockable/ trunk/test/Lockable/Lockable.cbp trunk/test/Lockable/ThreadPool.cpp trunk/test/Lockable/ThreadPool.hpp trunk/test/Lockable/main.cpp Added: trunk/test/Lockable/Lockable.cbp =================================================================== --- trunk/test/Lockable/Lockable.cbp (rev 0) +++ trunk/test/Lockable/Lockable.cbp 2011-09-29 23:31:47 UTC (rev 1121) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="Lockable" /> + <Option pch_mode="2" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug"> + <Option output="bin/Debug/Lockable" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj/Debug/" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-std=c++0x" /> + <Add option="-Wextra" /> + <Add option="-Wall" /> + <Add option="-g" /> + <Add directory="../../include" /> + </Compiler> + <Linker> + <Add library="/usr/lib/libpthread.so" /> + </Linker> + </Target> + <Target title="Release"> + <Option output="bin/Release/Lockable" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj/Release/" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-O2" /> + </Compiler> + <Linker> + <Add option="-s" /> + </Linker> + </Target> + </Build> + <Compiler> + <Add option="-Wall" /> + <Add option="-fexceptions" /> + </Compiler> + <Unit filename="ThreadPool.cpp" /> + <Unit filename="ThreadPool.hpp" /> + <Unit filename="main.cpp" /> + <Extensions> + <envvars /> + <code_completion /> + <lib_finder disable_auto="1" /> + <debugger /> + </Extensions> + </Project> +</CodeBlocks_project_file> Added: trunk/test/Lockable/ThreadPool.cpp =================================================================== --- trunk/test/Lockable/ThreadPool.cpp (rev 0) +++ trunk/test/Lockable/ThreadPool.cpp 2011-09-29 23:31:47 UTC (rev 1121) @@ -0,0 +1,116 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// ThreadLocal test program for The Loki Library +// Copyright (c) 2009 by Richard Sposato +// The copyright on this file is protected under the terms of the MIT license. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +//////////////////////////////////////////////////////////////////////////////// + +// ---------------------------------------------------------------------------- + +#include "ThreadPool.hpp" + +#include <sstream> +#include <iostream> + +// ---------------------------------------------------------------------------- + +Thread::Thread( CallFunction func, void * parm ) + : pthread_() + , func_( func ) + , parm_( parm ) +{ +} + +// ---------------------------------------------------------------------------- + +void Thread::AssignTask( CallFunction func, void * parm ) +{ + func_ = func; + parm_ = parm; +} + +// ---------------------------------------------------------------------------- + +int Thread::Start( void ) +{ + return LOKI_pthread_create( &pthread_, NULL, func_, parm_ ); +} + +// ---------------------------------------------------------------------------- + +int Thread::WaitForThread( void ) const +{ + return LOKI_pthread_join( pthread_ ); +} + +// ---------------------------------------------------------------------------- + +ThreadPool::ThreadPool( void ) : m_threads() +{ +} + +// ---------------------------------------------------------------------------- + +ThreadPool::~ThreadPool( void ) +{ + for ( size_t ii = 0; ii < m_threads.size(); ++ii ) + { + delete m_threads.at( ii ); + } +} + +// ---------------------------------------------------------------------------- + +void ThreadPool::Create( size_t threadCount, Thread::CallFunction function ) +{ + for( size_t ii = 0; ii < threadCount; ii++ ) + { + ::std::stringstream buffer; + buffer << "Creating thread " << ii << ::std::endl; + ::std::cout << buffer.rdbuf(); + Thread * thread = new Thread( function, reinterpret_cast< void * >( ii ) ); + m_threads.push_back( thread ); + } +} + +// ---------------------------------------------------------------------------- + +void ThreadPool::Start( void ) +{ + for ( size_t ii = 0; ii < m_threads.size(); ii++ ) + { + ::std::stringstream buffer; + buffer << "Starting thread " << ii << ::std::endl; + ::std::cout << buffer.rdbuf(); + m_threads.at( ii )->Start(); + } +} + +// ---------------------------------------------------------------------------- + +void ThreadPool::Join( void ) const +{ + for ( size_t ii = 0; ii < m_threads.size(); ii++ ) + m_threads.at( ii )->WaitForThread(); +} + +// ---------------------------------------------------------------------------- Added: trunk/test/Lockable/ThreadPool.hpp =================================================================== --- trunk/test/Lockable/ThreadPool.hpp (rev 0) +++ trunk/test/Lockable/ThreadPool.hpp 2011-09-29 23:31:47 UTC (rev 1121) @@ -0,0 +1,119 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// ThreadLocal test program for The Loki Library +// Copyright (c) 2009 by Richard Sposato +// The copyright on this file is protected under the terms of the MIT license. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +//////////////////////////////////////////////////////////////////////////////// + + +// ---------------------------------------------------------------------------- + +#include <vector> + +#if !defined( NULL ) + #define NULL 0 +#endif + +// define nullptr even though new compilers will have this keyword just so we +// have a consistent and easy way of identifying which uses of 0 mean null. +#if !defined( nullptr ) + #define nullptr NULL +#endif + +#if defined(_WIN32) + + #include <process.h> + #include <windows.h> + + typedef unsigned int ( WINAPI * ThreadFunction_ )( void * ); + + #define LOKI_pthread_t HANDLE + + #define LOKI_pthread_create( handle, attr, func, arg ) \ + ( int )( ( *handle = ( HANDLE ) _beginthreadex ( NULL, 0, ( ThreadFunction_ )func, arg, 0, NULL ) ) == NULL ) + + #define LOKI_pthread_join( thread ) \ + ( ( WaitForSingleObject( ( thread ), INFINITE ) != WAIT_OBJECT_0 ) || !CloseHandle( thread ) ) + +#else + + #include <pthread.h> + + #define LOKI_pthread_t \ + pthread_t + #define LOKI_pthread_create(handle,attr,func,arg) \ + pthread_create(handle,attr,func,arg) + #define LOKI_pthread_join(thread) \ + pthread_join(thread, NULL) + +#endif + +// ---------------------------------------------------------------------------- + +class Thread +{ +public: + + typedef void * ( * CallFunction )( void * ); + + Thread( CallFunction func, void * parm ); + + void AssignTask( CallFunction func, void * parm ); + + int Start( void ); + + int WaitForThread( void ) const; + +private: + + LOKI_pthread_t pthread_; + + CallFunction func_; + + void * parm_; + +}; + +// ---------------------------------------------------------------------------- + +class ThreadPool +{ +public: + + ThreadPool( void ); + + ~ThreadPool( void ); + + void Create( size_t threadCount, Thread::CallFunction function ); + + void Start( void ); + + void Join( void ) const; + +private: + + typedef ::std::vector< Thread * > Threads; + + Threads m_threads; +}; + +// ---------------------------------------------------------------------------- Added: trunk/test/Lockable/main.cpp =================================================================== --- trunk/test/Lockable/main.cpp (rev 0) +++ trunk/test/Lockable/main.cpp 2011-09-29 23:31:47 UTC (rev 1121) @@ -0,0 +1,302 @@ +//////////////////////////////////////////////////////////////////////////////// +// The Loki Library +// Copyright (c) 2011 by Rich Sposato +// +// This code does not accompany the book: +// Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design +// Patterns Applied". Copyright (c) 2001. Addison-Wesley. +// Code covered by the MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +//////////////////////////////////////////////////////////////////////////////// + +#define LOKI_OBJECT_LEVEL_THREADING +#include <loki/Threads.h> + +#include <vector> +#include <iostream> + +#include <loki/SafeFormat.h> +#include "ThreadPool.hpp" + + +using namespace std; + +static unsigned int g = 0; + +#define DO for(int i=0; i<10000000; i++) g++; + +static const unsigned int ThreadCount = 10; + +static const unsigned int ObjectCount = 50; + +static const unsigned int ClassCount = 5; + +static unsigned int FailCounts[ ThreadCount ]; + +// ---------------------------------------------------------------------------- + +class LockableObject : public ::Loki::ObjectLevelLockable< LockableObject > +{ +public: + + typedef ::Loki::ObjectLevelLockable< LockableObject > BaseClass; + + explicit LockableObject( unsigned int index ) : + BaseClass(), m_index( index ), m_value( ObjectCount ) {} + + ~LockableObject( void ) {} + + unsigned int GetIndex( void ) const { return m_index; } + + unsigned int GetValue( void ) const { return m_value; } + + void SetValue( unsigned int value ) { m_value = value; } + + void DoSomething( void ); + + void Print( unsigned int threadIndex ); + +private: + + const unsigned int m_index; + unsigned int m_value; + +}; + +// ---------------------------------------------------------------------------- + +void LockableObject::DoSomething( void) +{ + assert( NULL != this ); + DO; +} + +// ---------------------------------------------------------------------------- + +void LockableObject::Print( unsigned int threadIndex ) +{ + assert( NULL != this ); + const char * message = ( threadIndex != m_value ) ? "Mismatch!" : ""; + ::Loki::Printf( "Object: [%u] Thread: [%u] Value: [%u] %s\n" ) + ( m_index )( threadIndex )( m_value )( message ); +} + +// ---------------------------------------------------------------------------- + +typedef ::std::vector< LockableObject * > LockableObjects; + +LockableObjects & GetLockableObjects( void ) +{ + static LockableObjects objects; + return objects; +} + +// ---------------------------------------------------------------------------- + +LockableObject * GetLockableObject( unsigned int index ) +{ + LockableObjects & objects = GetLockableObjects(); + if ( objects.size() <= index ) + return NULL; + + LockableObject * object = objects[ index ]; + return object; +} + +// ---------------------------------------------------------------------------- + +void * RunObjectTest( void * p ) +{ + const unsigned int threadIndex = reinterpret_cast< unsigned int >( p ); + assert( threadIndex < ThreadCount ); + + unsigned int failCount = 0; + for ( unsigned int ii = 0; ii < ObjectCount; ++ii ) + { + LockableObject * object = GetLockableObject( ii ); + assert( NULL != object ); + LockableObject::Lock lock( *object ); + (void)lock; + object->SetValue( threadIndex ); + object->DoSomething(); + object->Print( threadIndex ); + object->DoSomething(); + const unsigned int value = object->GetValue(); + if ( value != threadIndex ) + ++failCount; + } + + FailCounts[ threadIndex ] = failCount; + + return NULL; +} + +// ---------------------------------------------------------------------------- + +void DoObjectLockTest( void ) +{ + cout << "Starting DoObjectLockTest" << endl; + + LockableObjects & objects = GetLockableObjects(); + objects.reserve( ObjectCount ); + for ( unsigned int ii = 0; ii < ObjectCount; ++ii ) + { + LockableObject * object = new LockableObject( ii ); + objects.push_back( object ); + } + + { + ThreadPool pool; + pool.Create( ThreadCount, &RunObjectTest ); + pool.Start(); + pool.Join(); + } + + unsigned int totalFails = 0; + for ( unsigned int ii = 0; ii < ThreadCount; ++ii ) + { + const unsigned int failCount = FailCounts[ ii ]; + ::Loki::Printf( "Thread: [%u] Failures: [%u]\n" )( ii )( failCount ); + totalFails += failCount; + } + const char * result = ( 0 == totalFails ) ? "Passed" : "FAILED"; + + cout << "Finished DoObjectLockTest. Total Fails: " << totalFails << " Result: " + << result << endl; +} + +// ---------------------------------------------------------------------------- + +class LockableClass : public ::Loki::ClassLevelLockable< LockableClass > +{ +public: + + typedef ::Loki::ClassLevelLockable< LockableClass > BaseClass; + + explicit LockableClass( unsigned int index ) : BaseClass(), m_index( index ) {} + + ~LockableClass( void ) {} + + unsigned int GetIndex( void ) const { return m_index; } + + void Print( unsigned int threadIndex ); + +private: + const unsigned int m_index; +}; + +// ---------------------------------------------------------------------------- + +void LockableClass::Print( unsigned int threadIndex ) +{ + assert( NULL != this ); + DO; ::Loki::Printf( "%u: %u: -----\n" )( m_index )( threadIndex ); + DO; ::Loki::Printf( "%u: %u: ----\n" )( m_index )( threadIndex ); + DO; ::Loki::Printf( "%u: %u: ---\n" )( m_index )( threadIndex ); + DO; ::Loki::Printf( "%u: %u: --\n" )( m_index )( threadIndex ); + DO; ::Loki::Printf( "%u: %u: -\n" )( m_index )( threadIndex ); + DO; ::Loki::Printf( "%u: %u: \n" )( m_index )( threadIndex ); +} + +// ---------------------------------------------------------------------------- + +typedef ::std::vector< LockableClass * > LockableClasses; + +LockableClasses & GetLockableClasses( void ) +{ + static LockableClasses objects; + return objects; +} + +// ---------------------------------------------------------------------------- + +LockableClass * GetLockableClass( unsigned int index ) +{ + LockableClasses & objects = GetLockableClasses(); + if ( objects.size() <= index ) + return NULL; + + LockableClass * object = objects[ index ]; + return object; +} + +// ---------------------------------------------------------------------------- + +void * RunClassTest( void * p ) +{ + const unsigned int threadIndex = reinterpret_cast< unsigned int >( p ); + assert( threadIndex < ThreadCount ); + + for ( unsigned int ii = 0; ii < ClassCount; ++ii ) + { + LockableClass * object = GetLockableClass( ii ); + assert( NULL != object ); + LockableClass::Lock lock( *object ); + (void)lock; + object->Print( threadIndex ); + } + + return NULL; +} + +// ---------------------------------------------------------------------------- + +void DoClassLockTest( void ) +{ + cout << "Starting DoClassLockTest" << endl; + + LockableClasses & objects = GetLockableClasses(); + objects.reserve( ClassCount ); + for ( unsigned int ii = 0; ii < ClassCount; ++ii ) + { + LockableClass * object = new LockableClass( ii ); + objects.push_back( object ); + } + + { + ThreadPool pool; + pool.Create( ThreadCount, &RunClassTest ); + pool.Start(); + pool.Join(); + } + + cout << "Finished DoClassLockTest" << endl; +} + +// ---------------------------------------------------------------------------- + +int main( int argc, const char * const argv[] ) +{ + (void)argc; + (void)argv; + char ender; + + DoObjectLockTest(); + cout << "Press <Enter> key to continue. "; + cin.get( ender ); + + DoClassLockTest(); + cout << "Press <Enter> key to finish. "; + cin.get( ender ); + + return 0; +} + +// ---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2011-09-30 23:14:06
|
Revision: 1125 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1125&view=rev Author: rich_sposato Date: 2011-09-30 23:13:59 +0000 (Fri, 30 Sep 2011) Log Message: ----------- Added tests for AssocVector class. Added Paths: ----------- trunk/test/AssocVector/ trunk/test/AssocVector/AssocVector.cbp trunk/test/AssocVector/main.cpp Added: trunk/test/AssocVector/AssocVector.cbp =================================================================== --- trunk/test/AssocVector/AssocVector.cbp (rev 0) +++ trunk/test/AssocVector/AssocVector.cbp 2011-09-30 23:13:59 UTC (rev 1125) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="AssocVector" /> + <Option pch_mode="2" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug"> + <Option output="bin/Debug/AssocVector" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj/Debug/" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-std=c++0x" /> + <Add option="-std=c++98" /> + <Add option="-Wextra" /> + <Add option="-Wall" /> + <Add option="-g" /> + <Add directory="../../include" /> + </Compiler> + </Target> + <Target title="Release"> + <Option output="bin/Release/AssocVector" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj/Release/" /> + <Option type="1" /> + <Option compiler="gcc" /> + <Compiler> + <Add option="-O2" /> + <Add option="-std=c++0x" /> + <Add option="-std=c++98" /> + <Add option="-Wextra" /> + <Add option="-Wall" /> + <Add directory="../../include" /> + </Compiler> + <Linker> + <Add option="-s" /> + </Linker> + </Target> + </Build> + <Compiler> + <Add option="-Wall" /> + <Add option="-fexceptions" /> + </Compiler> + <Unit filename="main.cpp" /> + <Extensions> + <envvars /> + <code_completion /> + <lib_finder disable_auto="1" /> + <debugger /> + </Extensions> + </Project> +</CodeBlocks_project_file> Added: trunk/test/AssocVector/main.cpp =================================================================== --- trunk/test/AssocVector/main.cpp (rev 0) +++ trunk/test/AssocVector/main.cpp 2011-09-30 23:13:59 UTC (rev 1125) @@ -0,0 +1,191 @@ +//////////////////////////////////////////////////////////////////////////////// +// The Loki Library +// Copyright (c) 2011 by Rich Sposato +// +// This code does not accompany the book: +// Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design +// Patterns Applied". Copyright (c) 2001. Addison-Wesley. +// Code covered by the MIT License +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +//////////////////////////////////////////////////////////////////////////////// + +#include <loki/AssocVector.h> + +#include <cassert> + +#include <string> +#include <iostream> + +using namespace std; + +typedef ::std::map< ::std::string, unsigned int > StudentGradeMap; +typedef StudentGradeMap::iterator StudentGradeMapIter; +typedef StudentGradeMap::const_iterator StudentGradeMapCIter; + +typedef ::Loki::AssocVector< ::std::string, unsigned int > StudentGrades; +typedef StudentGrades::iterator StudentGradeIter; +typedef StudentGrades::const_iterator StudentGradeCIter; + +typedef ::std::pair< ::std::string, unsigned int > GradeInfo; + + +GradeInfo oneStudent = ::std::make_pair( "Anne", 100 ); + +GradeInfo noDuplicates[] = +{ + ::std::make_pair( "Anne", 100 ), + ::std::make_pair( "Bill", 88 ), + ::std::make_pair( "Clay", 91 ), + ::std::make_pair( "Dina", 62 ), + ::std::make_pair( "Evan", 77 ), + ::std::make_pair( "Fran", 84 ), + ::std::make_pair( "Greg", 95 ) +}; + + +GradeInfo hasDuplicates[] = +{ + ::std::make_pair( "Anne", 100 ), + ::std::make_pair( "Anne", 73 ), + ::std::make_pair( "Bill", 88 ), + ::std::make_pair( "Clay", 91 ), + ::std::make_pair( "Dina", 62 ), + ::std::make_pair( "Evan", 77 ), + ::std::make_pair( "Fran", 74 ), + ::std::make_pair( "Fran", 84 ), + ::std::make_pair( "Greg", 95 ) +}; + +// ---------------------------------------------------------------------------- + +void TestEmptyAssocVector( void ) +{ + cout << "Starting TestEmptyAssocVector" << endl; + + StudentGrades grades; + const StudentGrades & cGrades = grades; + assert( grades.empty() ); + assert( grades.size() == 0 ); + assert( cGrades.empty() ); + assert( cGrades.size() == 0 ); + + StudentGradeIter it1( grades.begin() ); + assert( it1 == grades.end() ); + + const StudentGradeIter it2( grades.begin() ); + assert( it2 == grades.end() ); + assert( it2 == it1 ); + assert( it1 == it2 ); + + StudentGradeCIter cit1( grades.begin() ); + assert( cit1 == grades.end() ); + assert( cit1 == it1 ); + assert( cit1 == it2 ); + assert( it1 == cit1 ); + assert( it2 == cit1 ); + + const StudentGradeCIter cit2( grades.begin() ); + assert( cit2 == grades.end() ); + assert( cit1 == cit2 ); + assert( cit2 == cit1 ); + assert( cit2 == it1 ); + assert( cit2 == it2 ); + assert( it1 == cit2 ); + assert( it2 == cit2 ); + + StudentGradeCIter cit3( cGrades.begin() ); + assert( cit3 == cGrades.end() ); + assert( cit3 == it1 ); + assert( cit3 == it2 ); + assert( it1 == cit3 ); + assert( it2 == cit3 ); + + const StudentGradeCIter cit4( cGrades.begin() ); + assert( cit4 == cGrades.end() ); + assert( cit1 == cit4 ); + assert( cit4 == cit1 ); + assert( cit4 == it1 ); + assert( cit4 == it2 ); + assert( it1 == cit4 ); + assert( it2 == cit4 ); + + cout << "Finished TestEmptyAssocVector" << endl; +} + +// ---------------------------------------------------------------------------- + +void TestAssocVectorCtor( void ) +{ + cout << "Starting TestAssocVectorCtor" << endl; + + static const unsigned int noDuplicateCount = ( sizeof(noDuplicates) / sizeof(noDuplicates[0]) ); + static const unsigned int hasDuplicateCount = ( sizeof(hasDuplicates) / sizeof(hasDuplicates[0]) ); + + { + // This test demonstrates the iterator constructor does not allow any duplicate elements. + StudentGrades grades1( noDuplicates, noDuplicates + noDuplicateCount ); + StudentGrades grades2( hasDuplicates, hasDuplicates + hasDuplicateCount ); + assert( grades1.size() != 0 ); + assert( grades2.size() != 0 ); + assert( grades1.size() == noDuplicateCount ); + assert( grades2.size() == noDuplicateCount ); + assert( grades1.size() == grades2.size() ); + } + + { + // This test demonstrates copy construction. + StudentGrades grades1( noDuplicates, noDuplicates + noDuplicateCount ); + const StudentGrades grades2( grades1 ); + assert( grades1.size() != 0 ); + assert( grades2.size() != 0 ); + assert( grades1.size() == noDuplicateCount ); + assert( grades2.size() == noDuplicateCount ); + assert( grades1.size() == grades2.size() ); + assert( grades1 == grades2 ); + + StudentGrades grades3; + grades3 = grades1; + assert( grades3.size() != 0 ); + assert( grades3.size() == noDuplicateCount ); + assert( grades3.size() == grades1.size() ); + assert( grades1 == grades3 ); + } + + cout << "Finished TestAssocVectorCtor" << endl; +} + +// ---------------------------------------------------------------------------- + +int main( int argc, const char * const argv[] ) +{ + (void)argc; + (void)argv; + char ender; + + TestEmptyAssocVector(); + TestAssocVectorCtor(); + + cout << "Press <Enter> key to finish. " << endl; + cin.get( ender ); + + return 0; +} + +// ---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2011-10-17 08:03:26
|
Revision: 1146 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1146&view=rev Author: rich_sposato Date: 2011-10-17 08:03:19 +0000 (Mon, 17 Oct 2011) Log Message: ----------- Adding MSVC 10 project files. Added Paths: ----------- trunk/test/AssocVector/AssocVector.vcxproj trunk/test/CachedFactory/CachedFactory.vcxproj trunk/test/CheckReturn/CheckReturn.vcxproj trunk/test/Checker/Checker.vcxproj trunk/test/DeletableSingleton/DeletableSingleton.vcxproj trunk/test/Factory/Factory.vcxproj trunk/test/flex_string/flex_string.vcxproj Added: trunk/test/AssocVector/AssocVector.vcxproj =================================================================== --- trunk/test/AssocVector/AssocVector.vcxproj (rev 0) +++ trunk/test/AssocVector/AssocVector.vcxproj 2011-10-17 08:03:19 UTC (rev 1146) @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{0605A820-D075-48AC-ABB6-D3FF05D5CD1F}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>AssocVector</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>$(ProjectDir)$(Configuration)\</OutDir> + <IntDir>$(ProjectDir)$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>EnableAllWarnings</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies> + </AdditionalDependencies> + <OutputFile>$(ProjectDir)\$(Configuration)\$(ProjectName).exe</OutputFile> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..\include</AdditionalIncludeDirectories> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <TreatWarningAsError>false</TreatWarningAsError> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/CachedFactory/CachedFactory.vcxproj =================================================================== --- trunk/test/CachedFactory/CachedFactory.vcxproj (rev 0) +++ trunk/test/CachedFactory/CachedFactory.vcxproj 2011-10-17 08:03:19 UTC (rev 1146) @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{8D186AB4-E544-42D6-B192-1AE2C946875E}</ProjectGuid> + <RootNamespace>CachedFactory</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + <OutputFile>$(ProjectDir)\$(Configuration)\$(ProjectName).exe</OutputFile> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\CachedFactory.h" /> + <ClInclude Include="..\..\include\loki\Key.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="CachedFactoryTest.cpp" /> + <ClCompile Include="..\..\src\Singleton.cpp" /> + <ClCompile Include="..\..\src\SmallObj.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="CachedFactory.vcxproj"> + <Project>{8d186ab4-e544-42d6-b192-1ae2c946875e}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/CheckReturn/CheckReturn.vcxproj =================================================================== --- trunk/test/CheckReturn/CheckReturn.vcxproj (rev 0) +++ trunk/test/CheckReturn/CheckReturn.vcxproj 2011-10-17 08:03:19 UTC (rev 1146) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{C0826A05-9143-4545-B5DE-811C188CB54E}</ProjectGuid> + <RootNamespace>CheckReturn</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat> + </DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\CheckReturn.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\src\library.vcxproj"> + <Project>{cbdb8e7a-4286-4ae3-a190-ba33d7c53ff0}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/Checker/Checker.vcxproj =================================================================== --- trunk/test/Checker/Checker.vcxproj (rev 0) +++ trunk/test/Checker/Checker.vcxproj 2011-10-17 08:03:19 UTC (rev 1146) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{B1C04D81-E666-466A-A394-A3E74C830692}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <StringPooling>true</StringPooling> + <MinimalRebuild>true</MinimalRebuild> + <ExceptionHandling>Async</ExceptionHandling> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <StringPooling>true</StringPooling> + <ExceptionHandling>Async</ExceptionHandling> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\Checker.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="Checker.vcxproj"> + <Project>{b1c04d81-e666-466a-a394-a3e74c830692}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/DeletableSingleton/DeletableSingleton.vcxproj =================================================================== --- trunk/test/DeletableSingleton/DeletableSingleton.vcxproj (rev 0) +++ trunk/test/DeletableSingleton/DeletableSingleton.vcxproj 2011-10-17 08:03:19 UTC (rev 1146) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{B87B3522-7DAA-400D-A47D-A74B9B8B3552}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="DeletableSingleton.cpp" /> + <ClCompile Include="..\..\src\Singleton.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\Singleton.h" /> + <ClInclude Include="..\..\include\loki\Threads.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="DeletableSingleton.vcxproj"> + <Project>{b87b3522-7daa-400d-a47d-a74b9b8b3552}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/Factory/Factory.vcxproj =================================================================== --- trunk/test/Factory/Factory.vcxproj (rev 0) +++ trunk/test/Factory/Factory.vcxproj 2011-10-17 08:03:19 UTC (rev 1146) @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{925D5863-2F77-41B7-96F1-CC814762C40F}</ProjectGuid> + <RootNamespace>Factory</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies>../../lib/Loki_D.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="Factory.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\Factory.h" /> + <ClInclude Include="..\..\include\loki\Functor.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="Factory.vcxproj"> + <Project>{925d5863-2f77-41b7-96f1-cc814762c40f}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/flex_string/flex_string.vcxproj =================================================================== --- trunk/test/flex_string/flex_string.vcxproj (rev 0) +++ trunk/test/flex_string/flex_string.vcxproj 2011-10-17 08:03:19 UTC (rev 1146) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{2022B9AD-34CA-4FDA-80C2-42805FABE65B}</ProjectGuid> + <RootNamespace>Factory</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\flex\allocatorstringstorage.h" /> + <ClInclude Include="..\..\include\loki\flex\cowstringopt.h" /> + <ClInclude Include="..\..\include\loki\flex\flex_string.h" /> + <ClInclude Include="..\..\include\loki\flex\flex_string_details.h" /> + <ClInclude Include="..\..\include\loki\flex\flex_string_shell.h" /> + <ClInclude Include="..\..\include\loki\flex\simplestringstorage.h" /> + <ClInclude Include="..\..\include\loki\flex\smallstringopt.h" /> + <ClInclude Include="..\..\include\loki\flex\vectorstringstorage.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\src\library.vcxproj"> + <Project>{cbdb8e7a-4286-4ae3-a190-ba33d7c53ff0}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2011-10-17 08:10:36
|
Revision: 1147 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1147&view=rev Author: rich_sposato Date: 2011-10-17 08:10:29 +0000 (Mon, 17 Oct 2011) Log Message: ----------- Adding MSVC 10 project files. Added Paths: ----------- trunk/test/Function/Function.vcxproj trunk/test/LevelMutex/LevelMutex.vcxproj trunk/test/LockingPtr/LockingPtr.vcxproj trunk/test/Longevity/Longevity.vcxproj trunk/test/OrderedStatic/OrderedStatic.vcxproj trunk/test/Pimpl/Pimpl.vcxproj trunk/test/Register/Register.vcxproj trunk/test/RegressionTest/MSVCUnitTest.vcxproj Added: trunk/test/Function/Function.vcxproj =================================================================== --- trunk/test/Function/Function.vcxproj (rev 0) +++ trunk/test/Function/Function.vcxproj 2011-10-17 08:10:29 UTC (rev 1147) @@ -0,0 +1,142 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{2DE18D06-0F3A-4C6D-AF2B-40E074B3C3DC}</ProjectGuid> + <RootNamespace>Function</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;c:\sandbox\boost\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\AbstractFunction.h" /> + <ClInclude Include="..\..\include\loki\AssocVector.h" /> + <ClInclude Include="..\..\include\loki\DataGenerators.h" /> + <ClInclude Include="..\..\include\loki\EmptyType.h" /> + <ClInclude Include="..\..\include\loki\Function.h" /> + <ClInclude Include="..\..\include\loki\HierarchyGenerators.h" /> + <ClInclude Include="..\..\include\loki\LockingPtr.h" /> + <ClInclude Include="..\..\include\loki\LokiTypeInfo.h" /> + <ClInclude Include="..\..\include\loki\MultiMethods.h" /> + <ClInclude Include="..\..\include\loki\NullType.h" /> + <ClInclude Include="..\..\include\loki\OrderedStatic.h" /> + <ClInclude Include="..\..\include\loki\SafeFormat.h" /> + <ClInclude Include="..\..\include\loki\ScopeGuard.h" /> + <ClInclude Include="..\..\include\loki\Sequence.h" /> + <ClInclude Include="..\..\include\loki\Singleton.h" /> + <ClInclude Include="..\..\include\loki\SmallObj.h" /> + <ClInclude Include="..\..\include\loki\SmartPtr.h" /> + <ClInclude Include="..\..\include\loki\static_check.h" /> + <ClInclude Include="..\..\include\loki\Threads.h" /> + <ClInclude Include="..\..\include\loki\Tuple.h" /> + <ClInclude Include="..\..\include\loki\Typelist.h" /> + <ClInclude Include="..\..\include\loki\TypelistMacros.h" /> + <ClInclude Include="..\..\include\loki\TypeManip.h" /> + <ClInclude Include="..\..\include\loki\TypeTraits.h" /> + <ClInclude Include="..\..\include\loki\Visitor.h" /> + <ClInclude Include="..\..\include\loki\flex\allocatorstringstorage.h" /> + <ClInclude Include="..\..\include\loki\flex\cowstringopt.h" /> + <ClInclude Include="..\..\include\loki\flex\flex_string.h" /> + <ClInclude Include="..\..\include\loki\flex\flex_string_details.h" /> + <ClInclude Include="..\..\include\loki\flex\flex_string_shell.h" /> + <ClInclude Include="..\..\include\loki\flex\simplestringstorage.h" /> + <ClInclude Include="..\..\include\loki\flex\smallstringopt.h" /> + <ClInclude Include="..\..\include\loki\flex\vectorstringstorage.h" /> + <ClInclude Include="..\..\include\loki\Functor.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\src\Singleton.cpp" /> + <ClCompile Include="..\..\src\SmallObj.cpp" /> + <ClCompile Include="FunctionTest.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\..\src\library.vcxproj"> + <Project>{cbdb8e7a-4286-4ae3-a190-ba33d7c53ff0}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/LevelMutex/LevelMutex.vcxproj =================================================================== --- trunk/test/LevelMutex/LevelMutex.vcxproj (rev 0) +++ trunk/test/LevelMutex/LevelMutex.vcxproj 2011-10-17 08:10:29 UTC (rev 1147) @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{7C09E027-5484-4641-8310-BDDEB1EC8676}</ProjectGuid> + <RootNamespace>LevelMutex</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>NotSet</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>NotSet</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include/loki;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <StringPooling>true</StringPooling> + <MinimalRebuild>true</MinimalRebuild> + <ExceptionHandling>Async</ExceptionHandling> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <SmallerTypeCheck>true</SmallerTypeCheck> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki_D.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include/loki;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <StructMemberAlignment>1Byte</StructMemberAlignment> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat> + </DebugInformationFormat> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + <ClCompile Include="MultiThreadTests.cpp" /> + <ClCompile Include="Thing.cpp" /> + <ClCompile Include="ThreadPool.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="MultiThreadTests.hpp" /> + <ClInclude Include="Thing.hpp" /> + <ClInclude Include="ThreadPool.hpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="LevelMutex.vcxproj"> + <Project>{7c09e027-5484-4641-8310-bddeb1ec8676}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/LockingPtr/LockingPtr.vcxproj =================================================================== --- trunk/test/LockingPtr/LockingPtr.vcxproj (rev 0) +++ trunk/test/LockingPtr/LockingPtr.vcxproj 2011-10-17 08:10:29 UTC (rev 1147) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{25766C3F-C0D8-429F-A212-5FA3537B3E1C}</ProjectGuid> + <RootNamespace>LockingPtr</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;c:\sandbox\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies>../../lib/Loki_D.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <AdditionalDependencies>..\..\lib\loki.lib;%(AdditionalDependencies)</AdditionalDependencies> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\ConstPolicy.h" /> + <ClInclude Include="..\..\include\loki\LockingPtr.h" /> + <ClInclude Include="Thread.h" /> + <ClInclude Include="..\..\include\loki\Threads.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="LockingPtr.vcxproj"> + <Project>{25766c3f-c0d8-429f-a212-5fa3537b3e1c}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/Longevity/Longevity.vcxproj =================================================================== --- trunk/test/Longevity/Longevity.vcxproj (rev 0) +++ trunk/test/Longevity/Longevity.vcxproj 2011-10-17 08:10:29 UTC (rev 1147) @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{1333D945-B228-4845-9C91-C1B67AEEAED5}</ProjectGuid> + <RootNamespace>Longevity</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + <ClCompile Include="..\..\src\Singleton.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\Singleton.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="Longevity.vcxproj"> + <Project>{1333d945-b228-4845-9c91-c1b67aeeaed5}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/OrderedStatic/OrderedStatic.vcxproj =================================================================== --- trunk/test/OrderedStatic/OrderedStatic.vcxproj (rev 0) +++ trunk/test/OrderedStatic/OrderedStatic.vcxproj 2011-10-17 08:10:29 UTC (rev 1147) @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{0DCBE03A-DAC7-4669-B29B-102D8F563736}</ProjectGuid> + <RootNamespace>OrderedStatic</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies>../../lib/Loki_D.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + <ClCompile Include="..\..\src\OrderedStatic.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\OrderedStatic.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="OrderedStatic.vcxproj"> + <Project>{0dcbe03a-dac7-4669-b29b-102d8f563736}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/Pimpl/Pimpl.vcxproj =================================================================== --- trunk/test/Pimpl/Pimpl.vcxproj (rev 0) +++ trunk/test/Pimpl/Pimpl.vcxproj 2011-10-17 08:10:29 UTC (rev 1147) @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{21D2B291-80F4-476C-A643-B8A7034DF95F}</ProjectGuid> + <RootNamespace>Pimpl</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;c:\sandbox\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies>../../lib/Loki_D.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <AdditionalDependencies>..\..\lib\loki.lib;%(AdditionalDependencies)</AdditionalDependencies> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\Pimpl.h" /> + <ClInclude Include="type.h" /> + <ClInclude Include="type2.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="Pimpl.vcxproj"> + <Project>{21d2b291-80f4-476c-a643-b8a7034df95f}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/Register/Register.vcxproj =================================================================== --- trunk/test/Register/Register.vcxproj (rev 0) +++ trunk/test/Register/Register.vcxproj 2011-10-17 08:10:29 UTC (rev 1147) @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{873CFBF9-0D03-42D5-B2F9-A4C95A15EBCD}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>Register</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>$(ProjectDir)$(Configuration)\</OutDir> + <IntDir>$(ProjectDir)$(Configuration)\</IntDir> + <TargetName>Register.exe</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>$(ProjectDir)$(Configuration)\</OutDir> + <IntDir>$(ProjectDir)$(Configuration)\</IntDir> + <TargetName>Register</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <StringPooling>true</StringPooling> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OutputFile>$(ProjectDir)$(Configuration)\$(TargetName)$(TargetExt)</OutputFile> + <AdditionalDependencies>../../lib/Loki_D.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <StringPooling>true</StringPooling> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <OutputFile>$(ProjectDir)$(Configuration)\$(TargetName)$(TargetExt)</OutputFile> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="classlist.h" /> + <ClInclude Include="foo.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="foo.cpp" /> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/RegressionTest/MSVCUnitTest.vcxproj =================================================================== --- trunk/test/RegressionTest/MSVCUnitTest.vcxproj (rev 0) +++ trunk/test/RegressionTest/MSVCUnitTest.vcxproj 2011-10-17 08:10:29 UTC (rev 1147) @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{79729949-F144-4098-BFE9-B6320E6AC3F6}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <BufferSecurityCheck>true</BufferSecurityCheck> + <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType> + <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <OutputFile>$(OutDir)UnitTest.exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)UnitTest.pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki_D.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> + <OmitFramePointers>true</OmitFramePointers> + <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <OutputFile>$(OutDir)UnitTest.exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="AbstractFactoryTest.h" /> + <ClInclude Include="AssocVectorTest.h" /> + <ClInclude Include="DataGeneratorsTest.h" /> + <ClInclude Include="FactoryParmTest.h" /> + <ClInclude Include="FactoryTest.h" /> + <ClInclude Include="FunctorTest.h" /> + <ClInclude Include="LokiTest.h" /> + <ClInclude Include="SequenceTest.h" /> + <ClInclude Include="SingletonTest.h" /> + <ClInclude Include="SmallObjectTest.h" /> + <ClInclude Include="SmartPtrTest.h" /> + <ClInclude Include="ThreadsTest.h" /> + <ClInclude Include="TypelistTest.h" /> + <ClInclude Include="TypeManipTest.h" /> + <ClInclude Include="TypeTraitsTest.h" /> + <ClInclude Include="TypeTraitsTest2.h" /> + <ClInclude Include="UnitTest.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="Test.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2011-10-17 08:16:28
|
Revision: 1148 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1148&view=rev Author: rich_sposato Date: 2011-10-17 08:16:18 +0000 (Mon, 17 Oct 2011) Log Message: ----------- Adding MSVC 10 project files. Added Paths: ----------- trunk/test/SafeBits/SafeBits.vcxproj trunk/test/SafeFormat/SafeFormat.vcxproj trunk/test/ScopeGuard/ScopeGuard.vcxproj trunk/test/Singleton/Singleton.vcxproj trunk/test/SmallObj/SmallObjCompare.vcxproj trunk/test/SmallObj/SmallObjSingleton.vcxproj trunk/test/SmartPtr/SmartPtr.vcxproj trunk/test/Visitor/Visitor.vcxproj Added: trunk/test/SafeBits/SafeBits.vcxproj =================================================================== --- trunk/test/SafeBits/SafeBits.vcxproj (rev 0) +++ trunk/test/SafeBits/SafeBits.vcxproj 2011-10-17 08:16:18 UTC (rev 1148) @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{ECD7ED50-B99D-44BE-BA38-E17D6110C3E5}</ProjectGuid> + <RootNamespace>SafeBits</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <OutputFile>$(ProjectDir)\$(ConfigurationDir)$(ProjectName).exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat> + </DebugInformationFormat> + </ClCompile> + <Link> + <OutputFile>$(ProjectDir)\$(ConfigurationDir)$(ProjectName).exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="SafeBitTest.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/SafeFormat/SafeFormat.vcxproj =================================================================== --- trunk/test/SafeFormat/SafeFormat.vcxproj (rev 0) +++ trunk/test/SafeFormat/SafeFormat.vcxproj 2011-10-17 08:16:18 UTC (rev 1148) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{C161D9DD-EB96-44D0-9CDD-ABF22ECBC359}</ProjectGuid> + <RootNamespace>SafeFormat</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + <ClCompile Include="..\..\src\SafeFormat.cpp" /> + <ClCompile Include="ThreadPool.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\SafeFormat.h" /> + <ClInclude Include="ThreadPool.hpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/ScopeGuard/ScopeGuard.vcxproj =================================================================== --- trunk/test/ScopeGuard/ScopeGuard.vcxproj (rev 0) +++ trunk/test/ScopeGuard/ScopeGuard.vcxproj 2011-10-17 08:16:18 UTC (rev 1148) @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D5E7BAC2-A961-4ECC-ADA4-82D7510952BA}</ProjectGuid> + <RootNamespace>ScopeGuard</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\ScopeGuard.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/Singleton/Singleton.vcxproj =================================================================== --- trunk/test/Singleton/Singleton.vcxproj (rev 0) +++ trunk/test/Singleton/Singleton.vcxproj 2011-10-17 08:16:18 UTC (rev 1148) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{9F489E5D-9F29-4235-A9D4-79B5BA4EC48D}</ProjectGuid> + <RootNamespace>ScopeGuard</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies>../../lib/Loki_D.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="Dependencies.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="Phoenix.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\Singleton.h" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="Singleton.vcxproj"> + <Project>{9f489e5d-9f29-4235-a9d4-79b5ba4ec48d}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/SmallObj/SmallObjCompare.vcxproj =================================================================== --- trunk/test/SmallObj/SmallObjCompare.vcxproj (rev 0) +++ trunk/test/SmallObj/SmallObjCompare.vcxproj 2011-10-17 08:16:18 UTC (rev 1148) @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{0A98B714-818C-4DD3-A07C-BDD16399F362}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>/wd4100 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <OutputFile>$(OutDir)SmallObjCompare.exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)test.pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalOptions>/wd4100 %(AdditionalOptions)</AdditionalOptions> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat> + </DebugInformationFormat> + </ClCompile> + <Link> + <OutputFile>$(OutDir)SmallObjCompare.exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\src\Singleton.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <ClCompile Include="..\..\src\SmallObj.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <ClCompile Include="SmallObjBench.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\Singleton.h" /> + <ClInclude Include="..\..\include\loki\SmallObj.h" /> + <ClInclude Include="..\..\include\loki\Threads.h" /> + <ClInclude Include="timer.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/SmallObj/SmallObjSingleton.vcxproj =================================================================== --- trunk/test/SmallObj/SmallObjSingleton.vcxproj (rev 0) +++ trunk/test/SmallObj/SmallObjSingleton.vcxproj 2011-10-17 08:16:18 UTC (rev 1148) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{78536B46-8307-4AE5-933E-0CADE2887AFB}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <OutputFile>$(OutDir)SmallObjSingleton.exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)test.pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat> + </DebugInformationFormat> + </ClCompile> + <Link> + <OutputFile>$(OutDir)SmallObjSingleton.exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\src\Singleton.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <ClCompile Include="..\..\src\SmallObj.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <ClCompile Include="SmallObjSingleton.cpp"> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include/loki;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\Singleton.h" /> + <ClInclude Include="..\..\include\loki\SmallObj.h" /> + <ClInclude Include="..\..\include\loki\Threads.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/SmartPtr/SmartPtr.vcxproj =================================================================== --- trunk/test/SmartPtr/SmartPtr.vcxproj (rev 0) +++ trunk/test/SmartPtr/SmartPtr.vcxproj 2011-10-17 08:16:18 UTC (rev 1148) @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D7AB4FEF-E7AF-443D-93A5-37F323F2042D}</ProjectGuid> + <RootNamespace>SmartPtr</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;LOKI_OBJECT_LEVEL_THREADING;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <OutputFile>$(ProjectDir)\$(Configuration)\$(ProjectName).exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;LOKI_OBJECT_LEVEL_THREADING;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <WarningLevel>Level4</WarningLevel> + </ClCompile> + <Link> + <OutputFile>$(ProjectDir)\$(Configuration)\$(ProjectName).exe</OutputFile> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="base.h" /> + <ClInclude Include="..\..\include\loki\SafeFormat.h" /> + <ClInclude Include="..\..\include\loki\Singleton.h" /> + <ClInclude Include="..\..\include\loki\SmallObj.h" /> + <ClInclude Include="..\..\include\loki\SmartPtr.h" /> + <ClInclude Include="..\..\include\loki\StrongPtr.h" /> + <ClInclude Include="..\..\include\loki\Threads.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="colvin_gibbons_trick.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + </ClCompile> + <ClCompile Include="LockTest.cpp" /> + <ClCompile Include="main.cpp" /> + <ClCompile Include="..\..\src\SafeFormat.cpp" /> + <ClCompile Include="..\..\src\Singleton.cpp" /> + <ClCompile Include="..\..\src\SmallObj.cpp" /> + <ClCompile Include="..\..\src\SmartPtr.cpp" /> + <ClCompile Include="strong.cpp" /> + <ClCompile Include="..\..\src\StrongPtr.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/Visitor/Visitor.vcxproj =================================================================== --- trunk/test/Visitor/Visitor.vcxproj (rev 0) +++ trunk/test/Visitor/Visitor.vcxproj 2011-10-17 08:16:18 UTC (rev 1148) @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{0A696379-10A2-43FB-A26C-B42456FCF657}</ProjectGuid> + <RootNamespace>Visitor</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <AdditionalOptions>-wd4996 %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE _SECURE_SCL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\include\loki\Visitor.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2011-10-17 08:19:51
|
Revision: 1149 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1149&view=rev Author: rich_sposato Date: 2011-10-17 08:19:44 +0000 (Mon, 17 Oct 2011) Log Message: ----------- Adding MSVC 10 project files. Added Paths: ----------- trunk/test/Lockable/Lockable.vcxproj trunk/test/SmallObj/DefaultAlloc.vcxproj Added: trunk/test/Lockable/Lockable.vcxproj =================================================================== --- trunk/test/Lockable/Lockable.vcxproj (rev 0) +++ trunk/test/Lockable/Lockable.vcxproj 2011-10-17 08:19:44 UTC (rev 1149) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{22A34627-1480-4180-A8B6-4C05E77E27F8}</ProjectGuid> + <RootNamespace>Lockable</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>NotSet</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>NotSet</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <OutputFile>$(ProjectDir)\$(Configuration)\$(ProjectName).exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki_D.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MaxSpeed</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat> + </DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <OutputFile>$(ProjectDir)\$(Configuration)\$(ProjectName).exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies>../../lib/Loki.lib</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + <ClCompile Include="ThreadPool.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="ThreadPool.hpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/test/SmallObj/DefaultAlloc.vcxproj =================================================================== --- trunk/test/SmallObj/DefaultAlloc.vcxproj (rev 0) +++ trunk/test/SmallObj/DefaultAlloc.vcxproj 2011-10-17 08:19:44 UTC (rev 1149) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D490B134-B794-42CF-8AF8-9FDA524B9D3B}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>NotSet</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>NotSet</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <StructMemberAlignment>4Bytes</StructMemberAlignment> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <OutputFile>$(OutDir)DefaultAlloc.exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <ProgramDatabaseFile>$(OutDir)DefaultAlloc.pdb</ProgramDatabaseFile> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <AdditionalDependencies> + </AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <DebugInformationFormat> + </DebugInformationFormat> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + </ClCompile> + <Link> + <OutputFile>$(OutDir)DefaultAlloc.exe</OutputFile> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="DefaultAlloc.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="DefaultAlloc.vcxproj"> + <Project>{d490b134-b794-42cf-8af8-9fda524b9d3b}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + <Private>false</Private> + <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> + <LinkLibraryDependencies>true</LinkLibraryDependencies> + <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2011-10-17 19:55:29
|
Revision: 1150 http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1150&view=rev Author: rich_sposato Date: 2011-10-17 19:55:23 +0000 (Mon, 17 Oct 2011) Log Message: ----------- Added make files for projects. Added Paths: ----------- trunk/test/AssocVector/Makefile trunk/test/CheckReturn/Makefile trunk/test/Checker/Makefile trunk/test/LevelMutex/Makefile trunk/test/Lockable/Makefile trunk/test/SafeBits/Makefile trunk/test/ThreadLocal/Makefile Added: trunk/test/AssocVector/Makefile =================================================================== --- trunk/test/AssocVector/Makefile (rev 0) +++ trunk/test/AssocVector/Makefile 2011-10-17 19:55:23 UTC (rev 1150) @@ -0,0 +1,16 @@ +include ../Makefile.common + +BIN := main$(BIN_SUFFIX) +SRC := main.cpp +OBJ := $(SRC:.cpp=.o) + +.PHONY: all clean +all: $(BIN) +clean: cleandeps + $(RM) $(BIN) + $(RM) $(OBJ) + +$(BIN): $(OBJ) + $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) + +include ../../Makefile.deps Added: trunk/test/CheckReturn/Makefile =================================================================== --- trunk/test/CheckReturn/Makefile (rev 0) +++ trunk/test/CheckReturn/Makefile 2011-10-17 19:55:23 UTC (rev 1150) @@ -0,0 +1,16 @@ +include ../Makefile.common + +BIN := main$(BIN_SUFFIX) +SRC := main.cpp +OBJ := $(SRC:.cpp=.o) + +.PHONY: all clean +all: $(BIN) +clean: cleandeps + $(RM) $(BIN) + $(RM) $(OBJ) + +$(BIN): $(OBJ) + $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) + +include ../../Makefile.deps Added: trunk/test/Checker/Makefile =================================================================== --- trunk/test/Checker/Makefile (rev 0) +++ trunk/test/Checker/Makefile 2011-10-17 19:55:23 UTC (rev 1150) @@ -0,0 +1,16 @@ +include ../Makefile.common + +BIN := main$(BIN_SUFFIX) +SRC := main.cpp +OBJ := $(SRC:.cpp=.o) + +.PHONY: all clean +all: $(BIN) +clean: cleandeps + $(RM) $(BIN) + $(RM) $(OBJ) + +$(BIN): $(OBJ) + $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) + +include ../../Makefile.deps Added: trunk/test/LevelMutex/Makefile =================================================================== --- trunk/test/LevelMutex/Makefile (rev 0) +++ trunk/test/LevelMutex/Makefile 2011-10-17 19:55:23 UTC (rev 1150) @@ -0,0 +1,17 @@ +include ../Makefile.common + +BIN := main$(BIN_SUFFIX) +SRC := main.cpp MultiThreadTests.cpp Thing.cpp ThreadPool.cpp +OBJ := $(SRC:.cpp=.o) +LDLIBS += -lpthread + +.PHONY: all clean +all: $(BIN) +clean: cleandeps + $(RM) $(BIN) + $(RM) $(OBJ) + +$(BIN): $(OBJ) + $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) + +include ../../Makefile.deps Added: trunk/test/Lockable/Makefile =================================================================== --- trunk/test/Lockable/Makefile (rev 0) +++ trunk/test/Lockable/Makefile 2011-10-17 19:55:23 UTC (rev 1150) @@ -0,0 +1,17 @@ +include ../Makefile.common + +BIN := main$(BIN_SUFFIX) +SRC := main.cpp ThreadPool.cpp +OBJ := $(SRC:.cpp=.o) +LDLIBS += -lpthread + +.PHONY: all clean +all: $(BIN) +clean: cleandeps + $(RM) $(BIN) + $(RM) $(OBJ) + +$(BIN): $(OBJ) + $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) + +include ../../Makefile.deps Added: trunk/test/SafeBits/Makefile =================================================================== --- trunk/test/SafeBits/Makefile (rev 0) +++ trunk/test/SafeBits/Makefile 2011-10-17 19:55:23 UTC (rev 1150) @@ -0,0 +1,16 @@ +include ../Makefile.common + +BIN := SafeBitTest$(BIN_SUFFIX) +SRC := SafeBitTest.cpp +OBJ := $(SRC:.cpp=.o) + +.PHONY: all clean +all: $(BIN) +clean: cleandeps + $(RM) $(BIN) + $(RM) $(OBJ) + +$(BIN): $(OBJ) + $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) + +include ../../Makefile.deps Added: trunk/test/ThreadLocal/Makefile =================================================================== --- trunk/test/ThreadLocal/Makefile (rev 0) +++ trunk/test/ThreadLocal/Makefile 2011-10-17 19:55:23 UTC (rev 1150) @@ -0,0 +1,17 @@ +include ../Makefile.common + +BIN := main$(BIN_SUFFIX) +SRC := main.cpp ThreadTests.cpp ThreadPool.cpp +OBJ := $(SRC:.cpp=.o) +LDLIBS += -lpthread + +.PHONY: all clean +all: $(BIN) +clean: cleandeps + $(RM) $(BIN) + $(RM) $(OBJ) + +$(BIN): $(OBJ) + $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) + +include ../../Makefile.deps This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2013-06-23 01:15:00
|
Revision: 1185 http://sourceforge.net/p/loki-lib/code/1185 Author: rich_sposato Date: 2013-06-23 01:14:58 +0000 (Sun, 23 Jun 2013) Log Message: ----------- Changed types to remove compiler warning. Modified Paths: -------------- trunk/test/LevelMutex/ThreadPool.cpp trunk/test/LevelMutex/ThreadPool.hpp trunk/test/SmallObj/timer.h Modified: trunk/test/LevelMutex/ThreadPool.cpp =================================================================== --- trunk/test/LevelMutex/ThreadPool.cpp 2013-06-19 02:23:00 UTC (rev 1184) +++ trunk/test/LevelMutex/ThreadPool.cpp 2013-06-23 01:14:58 UTC (rev 1185) @@ -177,7 +177,7 @@ if ( threadCount <= countNow ) return threadCount; - const unsigned int totalCount = pThis->m_threads.size(); + const size_t totalCount = pThis->m_threads.size(); const unsigned int howManyToAdd = threadCount - countNow; if ( pThis->m_threads.capacity() <= howManyToAdd ) pThis->m_threads.reserve( totalCount + howManyToAdd ); @@ -200,12 +200,12 @@ // ---------------------------------------------------------------------------- -unsigned int ThreadPool::GetCount( void ) const volatile +size_t ThreadPool::GetCount( void ) const volatile { assert( IsValid() ); LOKI_DEBUG_CODE( Checker checker( this ); (void)checker; ) ThreadPool * pThis = const_cast< ThreadPool * >( this ); - const unsigned int count = pThis->m_threads.size(); + const size_t count = pThis->m_threads.size(); return count; } Modified: trunk/test/LevelMutex/ThreadPool.hpp =================================================================== --- trunk/test/LevelMutex/ThreadPool.hpp 2013-06-19 02:23:00 UTC (rev 1184) +++ trunk/test/LevelMutex/ThreadPool.hpp 2013-06-23 01:14:58 UTC (rev 1185) @@ -139,7 +139,7 @@ void JoinAll( void ) const volatile; - unsigned int GetCount( void ) const volatile; + size_t GetCount( void ) const volatile; unsigned int GetCount( Thread::Status status ) const volatile; Modified: trunk/test/SmallObj/timer.h =================================================================== --- trunk/test/SmallObj/timer.h 2013-06-19 02:23:00 UTC (rev 1184) +++ trunk/test/SmallObj/timer.h 2013-06-23 01:14:58 UTC (rev 1185) @@ -38,8 +38,8 @@ { t1 = clock(); } - - int t() + + clock_t t() { return t1-t0; } @@ -67,8 +67,8 @@ std::cout << s << "\tseconds: " << sec(t) << "\trelative time: " << rel(t) << "%\tspeed-up factor: " << speedup(t) << "" << std::endl; } private: - int t0; - int t1; + clock_t t0; + clock_t t1; }; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ric...@us...> - 2013-06-24 05:13:52
|
Revision: 1186 http://sourceforge.net/p/loki-lib/code/1186 Author: rich_sposato Date: 2013-06-24 05:13:49 +0000 (Mon, 24 Jun 2013) Log Message: ----------- Changed unsigned int to uintptr_t. Patch #23. Modified Paths: -------------- trunk/test/LevelMutex/MultiThreadTests.cpp trunk/test/LevelMutex/Thing.cpp trunk/test/LevelMutex/Thing.hpp trunk/test/Lockable/main.cpp trunk/test/SafeFormat/main.cpp trunk/test/ThreadLocal/ThreadTests.cpp Modified: trunk/test/LevelMutex/MultiThreadTests.cpp =================================================================== --- trunk/test/LevelMutex/MultiThreadTests.cpp 2013-06-23 01:14:58 UTC (rev 1185) +++ trunk/test/LevelMutex/MultiThreadTests.cpp 2013-06-24 05:13:49 UTC (rev 1186) @@ -89,7 +89,7 @@ void * PrintSafeThread( void * p ) { - unsigned int value = reinterpret_cast< unsigned int >( p ); + uintptr_t value = reinterpret_cast< uintptr_t >( p ); volatile Thing & thing = Thing::GetIt(); try { @@ -119,7 +119,7 @@ void * PrintUnsafeThread( void * p ) { - unsigned int value = reinterpret_cast< unsigned int >( p ); + uintptr_t value = reinterpret_cast< uintptr_t >( p ); Thing & thing = const_cast< Thing & >( Thing::GetIt() ); try { @@ -147,7 +147,7 @@ // ---------------------------------------------------------------------------- -void OutputResults( unsigned int loop, unsigned int value, unsigned int result ) +void OutputResults( unsigned int loop, uintptr_t value, uintptr_t result ) { static volatile SleepMutex mutex( 2 ); static bool initialized = false; @@ -177,7 +177,7 @@ const unsigned int testCount = 8; unsigned int fails = 0; - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); volatile Thing & thing = Thing::GetIt(); try { @@ -187,7 +187,7 @@ (void)locker; thing.SetValue( value ); ::GoToSleep( 3 ); - const unsigned int result = thing.GetValue(); + const uintptr_t result = thing.GetValue(); OutputResults( ii, value, result ); if ( result != value ) fails++; @@ -210,7 +210,7 @@ const unsigned int testCount = 8; unsigned int fails = 0; - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); // cast away volatility so the mutex doesn't get used by volatile functions. Thing & thing = const_cast< Thing & >( Thing::GetIt() ); try @@ -219,7 +219,7 @@ { thing.SetValue( value ); ::GoToSleep( 3 ); - const unsigned int result = thing.GetValue(); + const uintptr_t result = thing.GetValue(); OutputResults( ii, value, result ); if ( result != value ) fails++; @@ -249,7 +249,7 @@ cout << "Doing thread-locked print test. This test should pass and not deadlock" << endl; cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( PrintSafeThread, p ); @@ -262,7 +262,7 @@ cout << endl << "Doing thread-unsafe print test. This test may fail, but not deadlock." << endl; cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( PrintUnsafeThread, p ); @@ -279,7 +279,7 @@ void * TryLockThread( void * p ) { - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); volatile Thing & thing = Thing::GetIt(); volatile SleepMutex & mutex = thing.GetMutex(); assert( mutex.IsLockedByAnotherThread() ); @@ -297,7 +297,7 @@ result = mutex.Unlock(); assert( result == MutexErrors::Success ); } - const unsigned int gotValue = thing.GetValue(); + const uintptr_t gotValue = thing.GetValue(); assert( gotValue != value ); (void)gotValue; } @@ -313,7 +313,7 @@ cout << "Starting MultiThreadTryLockTest." << endl; char ender; - static const unsigned int threadCount = 3; + static const uintptr_t threadCount = 3; Thing::Init( 0 ); volatile Thing & thing = Thing::GetIt(); volatile SleepMutex & mutex = thing.GetMutex(); @@ -330,13 +330,13 @@ cout << endl << "Doing multi-threaded TryLock test. This test should not deadlock." << endl; cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( TryLockThread, p ); } pool.JoinAll(); - const unsigned int value = thing.GetValue(); + const uintptr_t value = thing.GetValue(); assert( value == threadCount ); } @@ -368,7 +368,7 @@ cout << endl << "Doing thread-safe value test. This test should pass and not deadlock." << endl; cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( ValueSafeThread, p ); @@ -401,7 +401,7 @@ bool RandomizeMutexOrder( LevelMutexInfo::MutexContainer & mutexes ) { - unsigned int count = mutexes.size(); + const size_t count = mutexes.size(); if ( count < 2 ) return false; @@ -409,7 +409,7 @@ for ( unsigned int ii = 0; ii < count; ++ii ) { volatile LevelMutexInfo * mutex = nullptr; - const unsigned int sizeNow = mutexes.size(); + const size_t sizeNow = mutexes.size(); if ( 1 < sizeNow ) { unsigned int index = ( ::rand() % sizeNow ); @@ -542,7 +542,7 @@ void * MultiLockSafeThread( void * p ) { - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); LevelMutexInfo::MutexContainer mutexes( thingCount ); volatile Thing * thing = nullptr; unsigned int jj = 0; @@ -618,7 +618,7 @@ void * MultiLockUnsafeThread( void * p ) { - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); Thing * thing = nullptr; unsigned int jj = 0; unsigned int tests = 0; @@ -683,7 +683,7 @@ char ender; Thing::MakePool( thingCount ); - const unsigned int threadCount = 8; + const uintptr_t threadCount = 8; TestResults::Create( threadCount ); { @@ -691,7 +691,7 @@ cout << endl << "Doing thread-safe multi-lock test. This test should pass and not deadlock." << endl; cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( MultiLockSafeThread, p ); @@ -706,7 +706,7 @@ TestResults::GetIt()->Reset( threadCount ); cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( MultiLockUnsafeThread, p ); @@ -725,7 +725,7 @@ void * MultiLockRandomSafeThread( void * p ) { - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); unsigned int testCount = 0; unsigned int failCount = 0; volatile Thing * thing = nullptr; @@ -751,7 +751,7 @@ assert( nullptr != thing ); pool.push_back( thing ); } - const unsigned int poolCount = pool.size(); + const size_t poolCount = pool.size(); mutexes.clear(); for ( jj = 0; jj < poolCount; ++jj ) @@ -795,7 +795,7 @@ void * MultiLockRandomUnsafeThread( void * p ) { - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); unsigned int testCount = 0; unsigned int failCount = 0; Thing * thing = nullptr; @@ -819,7 +819,7 @@ assert( nullptr != thing ); pool.push_back( thing ); } - const unsigned int poolCount = pool.size(); + const size_t poolCount = pool.size(); for ( jj = 0; jj < poolCount; ++jj ) { @@ -857,7 +857,7 @@ char ender; Thing::MakePool( thingCount ); - const unsigned int threadCount = 8; + const uintptr_t threadCount = 8; TestResults::Create( threadCount ); { @@ -865,7 +865,7 @@ cout << endl << "Doing thread-safe random multi-lock test. This test should pass and not deadlock." << endl; cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( MultiLockRandomSafeThread, p ); @@ -880,7 +880,7 @@ TestResults::GetIt()->Reset( threadCount ); cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( MultiLockRandomUnsafeThread, p ); @@ -900,7 +900,7 @@ void * SafeHierarchyTest( void * p ) { - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); volatile LevelThing * thing = nullptr; unsigned int testCount = 0; unsigned int failCount = 0; @@ -949,7 +949,7 @@ void * UnsafeHierarchyTest( void * p ) { - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); LevelThing * thing = nullptr; unsigned int testCount = 0; unsigned int failCount = 0; @@ -997,7 +997,7 @@ char ender; LevelThing::MakePool( thingCount ); - const unsigned int threadCount = 8; + const uintptr_t threadCount = 8; TestResults::Create( threadCount ); { @@ -1005,7 +1005,7 @@ cout << endl << "Doing thread-safe hierarchy test. This test should pass and not deadlock." << endl; cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( SafeHierarchyTest, p ); @@ -1020,7 +1020,7 @@ cout << "Press <Enter> key to start test. "; cin.get( ender ); TestResults::GetIt()->Reset( threadCount ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( UnsafeHierarchyTest, p ); @@ -1040,7 +1040,7 @@ void * SafeHierarchyMultiLockTest( void * p ) { - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); unsigned int testCount = 0; unsigned int failCount = 0; unsigned int totalTestCount = 0; @@ -1091,7 +1091,7 @@ void * UnsafeHierarchyMultiLockTest( void * p ) { - const unsigned int value = reinterpret_cast< unsigned int >( p ); + const uintptr_t value = reinterpret_cast< uintptr_t >( p ); unsigned int testCount = 0; unsigned int failCount = 0; unsigned int totalTestCount = 0; @@ -1137,7 +1137,7 @@ char ender; MultiLevelPool::MakePool( 10, thingCount ); - const unsigned int threadCount = 8; + const uintptr_t threadCount = 8; TestResults::Create( threadCount ); { @@ -1145,7 +1145,7 @@ cout << endl << "Doing thread-safe multilock hierarchy test. This test should pass and not deadlock." << endl; cout << "Press <Enter> key to start test. "; cin.get( ender ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( SafeHierarchyMultiLockTest, p ); @@ -1160,7 +1160,7 @@ cout << "Press <Enter> key to start test. "; cin.get( ender ); TestResults::GetIt()->Reset( threadCount ); - for ( unsigned int ii = 0; ii < threadCount; ++ii ) + for ( uintptr_t ii = 0; ii < threadCount; ++ii ) { void * p = reinterpret_cast< void * >( ii ); pool.Start( UnsafeHierarchyMultiLockTest, p ); Modified: trunk/test/LevelMutex/Thing.cpp =================================================================== --- trunk/test/LevelMutex/Thing.cpp 2013-06-23 01:14:58 UTC (rev 1185) +++ trunk/test/LevelMutex/Thing.cpp 2013-06-24 05:13:49 UTC (rev 1186) @@ -195,7 +195,7 @@ // ---------------------------------------------------------------------------- -void TestResults::SetResult( unsigned int threadIndex, unsigned int total, +void TestResults::SetResult( uintptr_t threadIndex, unsigned int total, unsigned int fails ) { assert( NULL != this ); @@ -361,7 +361,7 @@ // ---------------------------------------------------------------------------- -void Thing::Print( unsigned int value, unsigned int index, unsigned int startSize ) const volatile +void Thing::Print( uintptr_t value, unsigned int index, unsigned int startSize ) const volatile { assert( NULL != this ); MutexLocker locker( m_mutex ); @@ -374,7 +374,7 @@ // ---------------------------------------------------------------------------- -void Thing::Print( unsigned int value, unsigned int index, unsigned int startSize ) const +void Thing::Print( uintptr_t value, unsigned int index, unsigned int startSize ) const { assert( NULL != this ); switch ( startSize ) @@ -402,7 +402,7 @@ // ---------------------------------------------------------------------------- -void Thing::SetValue( unsigned int value ) volatile +void Thing::SetValue( uintptr_t value ) volatile { assert( NULL != this ); SingleThingLocker pSafeThis( *this, m_mutex ); @@ -506,7 +506,7 @@ // ---------------------------------------------------------------------------- -void LevelThing::SetValue( unsigned int value ) volatile +void LevelThing::SetValue( uintptr_t value ) volatile { assert( NULL != this ); MutexLocker locker( m_mutex, !m_mutex.IsLockedByCurrentThread() ); @@ -522,7 +522,7 @@ // ---------------------------------------------------------------------------- -void LevelThing::SetValue( unsigned int value ) +void LevelThing::SetValue( uintptr_t value ) { assert( NULL != this ); m_value = value; @@ -536,7 +536,7 @@ // ---------------------------------------------------------------------------- -bool LevelThing::DoValuesMatch( unsigned int value ) const volatile +bool LevelThing::DoValuesMatch( uintptr_t value ) const volatile { assert( NULL != this ); { @@ -555,7 +555,7 @@ // ---------------------------------------------------------------------------- -bool LevelThing::DoValuesMatch( unsigned int value ) const +bool LevelThing::DoValuesMatch( uintptr_t value ) const { assert( NULL != this ); if ( m_value != value ) @@ -592,7 +592,7 @@ // ---------------------------------------------------------------------------- -void SomeThing::SetValue( unsigned int value ) volatile +void SomeThing::SetValue( uintptr_t value ) volatile { assert( NULL != this ); SomeThingLocker pSafeThis( *this, m_mutex ); @@ -707,7 +707,7 @@ // ---------------------------------------------------------------------------- void CheckForMatchingValues( unsigned int & failCount, unsigned int & testCount, - unsigned int value, const SomeThingPool & pool ) + uintptr_t value, const SomeThingPool & pool ) { const unsigned int count = pool.size(); for ( unsigned int ii = 0; ii < count; ++ii ) @@ -723,7 +723,7 @@ // ---------------------------------------------------------------------------- void CheckForMatchingValues( unsigned int & failCount, unsigned int & testCount, - unsigned int value, const SomeThingPool & pool, bool locked ) + uintptr_t value, const SomeThingPool & pool, bool locked ) { if ( !locked ) { Modified: trunk/test/LevelMutex/Thing.hpp =================================================================== --- trunk/test/LevelMutex/Thing.hpp 2013-06-23 01:14:58 UTC (rev 1185) +++ trunk/test/LevelMutex/Thing.hpp 2013-06-24 05:13:49 UTC (rev 1186) @@ -27,7 +27,17 @@ #include <vector> +#if !defined(_MSC_VER) + #if defined(__sparc__) + #include <inttypes.h> + #else + #include <stdint.h> + #endif +#else + typedef unsigned int uintptr_t; +#endif + // ---------------------------------------------------------------------------- void GoToSleep( unsigned int milliSeconds ); @@ -89,7 +99,7 @@ void Reset( unsigned int threadCount ); - void SetResult( unsigned int threadIndex, unsigned int total, + void SetResult( uintptr_t threadIndex, unsigned int total, unsigned int fails ); void OutputResults( void ); @@ -142,17 +152,17 @@ static void DestroyPool( void ); - void Print( unsigned int value, unsigned int index, unsigned int startSize ) const volatile; + void Print( uintptr_t value, unsigned int index, unsigned int startSize ) const volatile; - void Print( unsigned int value, unsigned int index, unsigned int startSize ) const; + void Print( uintptr_t value, unsigned int index, unsigned int startSize ) const; - unsigned int GetValue( void ) const volatile { return m_value; } + uintptr_t GetValue( void ) const volatile { return m_value; } - unsigned int GetValue( void ) const { return m_value; } + uintptr_t GetValue( void ) const { return m_value; } - void SetValue( unsigned int value ) volatile; + void SetValue( uintptr_t value ) volatile; - void SetValue( unsigned int value ) { m_value = value; } + void SetValue( uintptr_t value ) { m_value = value; } inline volatile SleepMutex & GetMutex( void ) volatile { return m_mutex; } @@ -175,7 +185,7 @@ static TestResults s_results; mutable volatile SleepMutex m_mutex; - unsigned int m_value; + uintptr_t m_value; }; typedef ::std::vector< Thing * > UnsafeThingPool; @@ -219,17 +229,17 @@ void UnlockHierarchy( void ) volatile; - void SetValue( unsigned int value ) volatile; + void SetValue( uintptr_t value ) volatile; - void SetValue( unsigned int value ); + void SetValue( uintptr_t value ); - inline unsigned int GetValue( void ) const volatile { return m_value; } + inline uintptr_t GetValue( void ) const volatile { return m_value; } - inline unsigned int GetValue( void ) const { return m_value; } + inline uintptr_t GetValue( void ) const { return m_value; } - bool DoValuesMatch( unsigned int value ) const volatile; + bool DoValuesMatch( uintptr_t value ) const volatile; - bool DoValuesMatch( unsigned int value ) const; + bool DoValuesMatch( uintptr_t value ) const; inline volatile ::Loki::LevelMutexInfo & GetMutex( void ) volatile { return m_mutex; } @@ -251,7 +261,7 @@ mutable volatile SleepMutex m_mutex; const unsigned int m_place; - unsigned int m_value; + uintptr_t m_value; }; // ---------------------------------------------------------------------------- @@ -266,13 +276,13 @@ inline unsigned int GetLevel( void ) const volatile { return m_level; } - void SetValue( unsigned int value ) volatile; + void SetValue( uintptr_t value ) volatile; - void SetValue( unsigned int value ); + void SetValue( uintptr_t value ); - inline unsigned int GetValue( void ) const volatile { return m_value; } + inline uintptr_t GetValue( void ) const volatile { return m_value; } - inline unsigned int GetValue( void ) const { return m_value; } + inline uintptr_t GetValue( void ) const { return m_value; } inline volatile ::Loki::LevelMutexInfo & GetMutex( void ) volatile { return m_mutex; } @@ -287,7 +297,7 @@ mutable volatile SleepMutex m_mutex; const unsigned int m_place; const unsigned int m_level; - unsigned int m_value; + uintptr_t m_value; }; typedef ::std::vector< volatile SomeThing * > SomeThingPool; @@ -346,10 +356,10 @@ // ---------------------------------------------------------------------------- void CheckForMatchingValues( unsigned int & failCount, unsigned int & testCount, - unsigned int value, const SomeThingPool & pool ); + uintptr_t value, const SomeThingPool & pool ); void CheckForMatchingValues( unsigned int & failCount, unsigned int & testCount, - unsigned int value, const SomeThingPool & pool, bool locked ); + uintptr_t value, const SomeThingPool & pool, bool locked ); void MakePool( SomeThingPool & pool ); Modified: trunk/test/Lockable/main.cpp =================================================================== --- trunk/test/Lockable/main.cpp 2013-06-23 01:14:58 UTC (rev 1185) +++ trunk/test/Lockable/main.cpp 2013-06-24 05:13:49 UTC (rev 1186) @@ -36,6 +36,17 @@ #include "ThreadPool.hpp" +#if !defined(_MSC_VER) + #if defined(__sparc__) + #include <inttypes.h> + #else + #include <stdint.h> + #endif +#else + typedef unsigned int uintptr_t; +#endif + + using namespace std; static unsigned int g = 0; @@ -58,25 +69,25 @@ typedef ::Loki::ObjectLevelLockable< LockableObject > BaseClass; - explicit LockableObject( unsigned int index ) : + explicit LockableObject( uintptr_t index ) : BaseClass(), m_index( index ), m_value( ObjectCount ) {} ~LockableObject( void ) {} - unsigned int GetIndex( void ) const { return m_index; } + uintptr_t GetIndex( void ) const { return m_index; } - unsigned int GetValue( void ) const { return m_value; } + uintptr_t GetValue( void ) const { return m_value; } - void SetValue( unsigned int value ) { m_value = value; } + void SetValue( uintptr_t value ) { m_value = value; } void DoSomething( void ); - void Print( unsigned int threadIndex ); + void Print( uintptr_t threadIndex ); private: - const unsigned int m_index; - unsigned int m_value; + const uintptr_t m_index; + uintptr_t m_value; }; @@ -90,7 +101,7 @@ // ---------------------------------------------------------------------------- -void LockableObject::Print( unsigned int threadIndex ) +void LockableObject::Print( uintptr_t threadIndex ) { assert( NULL != this ); const char * result = ( threadIndex != m_value ) ? "Mismatch!" : ""; @@ -126,7 +137,7 @@ void * RunObjectTest( void * p ) { - const unsigned int threadIndex = reinterpret_cast< unsigned int >( p ); + const uintptr_t threadIndex = reinterpret_cast< uintptr_t >( p ); assert( threadIndex < ThreadCount ); unsigned int failCount = 0; @@ -140,7 +151,7 @@ object->DoSomething(); object->Print( threadIndex ); object->DoSomething(); - const unsigned int value = object->GetValue(); + const uintptr_t value = object->GetValue(); if ( value != threadIndex ) ++failCount; } @@ -192,23 +203,23 @@ typedef ::Loki::ClassLevelLockable< LockableClass > BaseClass; - explicit LockableClass( unsigned int index ) : BaseClass(), m_index( index ) {} + explicit LockableClass( uintptr_t index ) : BaseClass(), m_index( index ) {} ~LockableClass( void ) {} - unsigned int GetIndex( void ) const { return m_index; } + uintptr_t GetIndex( void ) const { return m_index; } - void Print( unsigned int threadIndex ); + void Print( uintptr_t threadIndex ); private: /// Assignment operator is not implemented. LockableClass & operator = ( const LockableClass & ); - const unsigned int m_index; + const uintptr_t m_index; }; // ---------------------------------------------------------------------------- -void LockableClass::Print( unsigned int threadIndex ) +void LockableClass::Print( uintptr_t threadIndex ) { assert( NULL != this ); DO; ::Loki::Printf( "%u: %u: -----\n" )( m_index )( threadIndex ); @@ -245,7 +256,7 @@ void * RunClassTest( void * p ) { - const unsigned int threadIndex = reinterpret_cast< unsigned int >( p ); + const uintptr_t threadIndex = reinterpret_cast< uintptr_t >( p ); assert( threadIndex < ThreadCount ); for ( unsigned int ii = 0; ii < ClassCount; ++ii ) Modified: trunk/test/SafeFormat/main.cpp =================================================================== --- trunk/test/SafeFormat/main.cpp 2013-06-23 01:14:58 UTC (rev 1185) +++ trunk/test/SafeFormat/main.cpp 2013-06-24 05:13:49 UTC (rev 1186) @@ -23,6 +23,17 @@ #include "ThreadPool.hpp" +#if !defined(_MSC_VER) + #if defined(__sparc__) + #include <inttypes.h> + #else + #include <stdint.h> + #endif +#else + typedef unsigned int uintptr_t; +#endif + + #if defined(_MSC_VER) #if _MSC_VER >= 1400 #define sprintf sprintf_s @@ -367,7 +378,7 @@ void * DoLokiFPrintfLoop( void * p ) { - const unsigned int threadIndex = reinterpret_cast< unsigned int >( p ); + const uintptr_t threadIndex = reinterpret_cast< uintptr_t >( p ); for ( unsigned int loop = 0; loop < 10; ++loop ) { @@ -381,7 +392,7 @@ void * DoLokiPrintfLoop( void * p ) { - const unsigned int threadIndex = reinterpret_cast< unsigned int >( p ); + const uintptr_t threadIndex = reinterpret_cast< uintptr_t >( p ); for ( unsigned int loop = 0; loop < 10; ++loop ) { @@ -395,7 +406,7 @@ void * DoStdOutLoop( void * p ) { - const unsigned int threadIndex = reinterpret_cast< unsigned int >( p ); + const uintptr_t threadIndex = reinterpret_cast< uintptr_t >( p ); for ( unsigned int loop = 0; loop < 10; ++loop ) { @@ -409,7 +420,7 @@ void * DoCoutLoop( void * p ) { - const unsigned int threadIndex = reinterpret_cast< unsigned int >( p ); + const uintptr_t threadIndex = reinterpret_cast< uintptr_t >( p ); for ( unsigned int loop = 0; loop < 10; ++loop ) { Modified: trunk/test/ThreadLocal/ThreadTests.cpp =================================================================== --- trunk/test/ThreadLocal/ThreadTests.cpp 2013-06-23 01:14:58 UTC (rev 1185) +++ trunk/test/ThreadLocal/ThreadTests.cpp 2013-06-24 05:13:49 UTC (rev 1186) @@ -37,11 +37,22 @@ #include <cassert> +#if !defined(_MSC_VER) + #if defined(__sparc__) + #include <inttypes.h> + #else + #include <stdint.h> + #endif +#else + typedef unsigned int uintptr_t; +#endif + + // ---------------------------------------------------------------------------- -typedef ::std::vector< unsigned int > IntVector; +typedef ::std::vector< uintptr_t > IntVector; -static LOKI_THREAD_LOCAL unsigned int StandaloneStaticValue = 0; +static LOKI_THREAD_LOCAL uintptr_t StandaloneStaticValue = 0; static const unsigned int ThreadCount = 4; @@ -49,7 +60,7 @@ IntVector & GetIntVector( void ) { - unsigned int v = 0; + uintptr_t v = 0; static IntVector addresses( ThreadCount, v ); return addresses; } @@ -59,7 +70,7 @@ void * AddToIntVector( void * p ) { assert( 0 == StandaloneStaticValue ); - const unsigned int ii = reinterpret_cast< unsigned int >( p ); + const uintptr_t ii = reinterpret_cast< uintptr_t >( p ); assert( 0 < ii ); assert( ii < ThreadCount + 1 ); StandaloneStaticValue = ii; @@ -86,10 +97,10 @@ IntVector & v = GetIntVector(); for ( unsigned int i1 = 0; i1 < ThreadCount - 1; ++i1 ) { - const unsigned int v1 = v[ i1 ]; + const uintptr_t v1 = v[ i1 ]; for ( unsigned int i2 = i1 + 1; i2 < ThreadCount; ++i2 ) { - const unsigned int v2 = v[ i2 ]; + const uintptr_t v2 = v[ i2 ]; if ( v1 == v2 ) { allDifferent = false; @@ -106,9 +117,9 @@ // ---------------------------------------------------------------------------- -unsigned int & GetFunctionThreadLocalValue( void ) +uintptr_t & GetFunctionThreadLocalValue( void ) { - static LOKI_THREAD_LOCAL unsigned int FunctionStaticValue = 0; + static LOKI_THREAD_LOCAL uintptr_t FunctionStaticValue = 0; return FunctionStaticValue; } @@ -116,9 +127,9 @@ void * ChangeFunctionStaticValue( void * p ) { - unsigned int & thatValue = GetFunctionThreadLocalValue(); + uintptr_t & thatValue = GetFunctionThreadLocalValue(); assert( 0 == thatValue ); - const unsigned int ii = reinterpret_cast< unsigned int >( p ); + const uintptr_t ii = reinterpret_cast< uintptr_t >( p ); assert( 0 < ii ); assert( ii < ThreadCount + 1 ); thatValue = ii + ThreadCount; @@ -151,10 +162,10 @@ bool allDifferent = true; for ( unsigned int i1 = 0; i1 < ThreadCount - 1; ++i1 ) { - const unsigned int v1 = v[ i1 ]; + const uintptr_t v1 = v[ i1 ]; for ( unsigned int i2 = i1 + 1; i2 < ThreadCount; ++i2 ) { - const unsigned int v2 = v[ i2 ]; + const uintptr_t v2 = v[ i2 ]; if ( v1 == v2 ) { allDifferent = false; @@ -175,24 +186,24 @@ { public: - static inline void SetValue( unsigned int value ) { ClassThreadLocal = value; } + static inline void SetValue( uintptr_t value ) { ClassThreadLocal = value; } - static inline unsigned int GetValue( void ) { return ClassThreadLocal; } + static inline uintptr_t GetValue( void ) { return ClassThreadLocal; } private: - static LOKI_THREAD_LOCAL unsigned int ClassThreadLocal; + static LOKI_THREAD_LOCAL uintptr_t ClassThreadLocal; }; -LOKI_THREAD_LOCAL unsigned int ThreadAware::ClassThreadLocal = 0; +LOKI_THREAD_LOCAL uintptr_t ThreadAware::ClassThreadLocal = 0; // ---------------------------------------------------------------------------- void * ChangeClassStaticValue( void * p ) { assert( ThreadAware::GetValue() == 0 ); - const unsigned int ii = reinterpret_cast< unsigned int >( p ); + const uintptr_t ii = reinterpret_cast< uintptr_t >( p ); assert( 0 < ii ); assert( ii < ThreadCount + 1 ); ThreadAware::SetValue( ii + 2 * ThreadCount ); @@ -225,10 +236,10 @@ bool allDifferent = true; for ( unsigned int i1 = 0; i1 < ThreadCount - 1; ++i1 ) { - const unsigned int v1 = v[ i1 ]; + const uintptr_t v1 = v[ i1 ]; for ( unsigned int i2 = i1 + 1; i2 < ThreadCount; ++i2 ) { - const unsigned int v2 = v[ i2 ]; + const uintptr_t v2 = v[ i2 ]; if ( v1 == v2 ) { allDifferent = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |