diff options
| author | Bernard Normier <bernard@zeroc.com> | 2015-02-04 15:03:24 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2015-02-04 15:03:24 -0500 |
| commit | 556b6a2a58efdf035b96691c9a14ad0fbe36638b (patch) | |
| tree | 5dc72542953ab2f08931e0faa4afd654c86494c2 /cpp/demo/Manual/lifecycle | |
| parent | Reverted previous accidental commit from Grammar.h/.cpp in Freeze phonebook (diff) | |
| parent | ICE-5814 Always enable extra warnings for demos (diff) | |
| download | ice-556b6a2a58efdf035b96691c9a14ad0fbe36638b.tar.bz2 ice-556b6a2a58efdf035b96691c9a14ad0fbe36638b.tar.xz ice-556b6a2a58efdf035b96691c9a14ad0fbe36638b.zip | |
Merge branch 'master' of ssh://git/home/git/ice
Diffstat (limited to 'cpp/demo/Manual/lifecycle')
| -rw-r--r-- | cpp/demo/Manual/lifecycle/Makefile | 2 | ||||
| -rw-r--r-- | cpp/demo/Manual/lifecycle/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/demo/Manual/lifecycle/manual.lifecycle.client.vcxproj | 10 | ||||
| -rw-r--r-- | cpp/demo/Manual/lifecycle/manual.lifecycle.server.vcxproj | 10 |
4 files changed, 10 insertions, 14 deletions
diff --git a/cpp/demo/Manual/lifecycle/Makefile b/cpp/demo/Manual/lifecycle/Makefile index cd2a03bfabc..073f1d819a9 100644 --- a/cpp/demo/Manual/lifecycle/Makefile +++ b/cpp/demo/Manual/lifecycle/Makefile @@ -9,9 +9,7 @@ top_srcdir = ../../.. -ifeq ($(shell test -f $(top_srcdir)/../.gitignore && echo 0),0) MAXWARN = yes -endif CLIENT = client SERVER = server diff --git a/cpp/demo/Manual/lifecycle/Makefile.mak b/cpp/demo/Manual/lifecycle/Makefile.mak index 241ac59249b..11ea236d750 100644 --- a/cpp/demo/Manual/lifecycle/Makefile.mak +++ b/cpp/demo/Manual/lifecycle/Makefile.mak @@ -9,9 +9,7 @@ top_srcdir = ..\..\.. -!if exist ($(top_srcdir)\..\.gitignore) MAXWARN = yes -!endif CLIENT = client.exe SERVER = server.exe diff --git a/cpp/demo/Manual/lifecycle/manual.lifecycle.client.vcxproj b/cpp/demo/Manual/lifecycle/manual.lifecycle.client.vcxproj index bacb4833cb3..210c14082f5 100644 --- a/cpp/demo/Manual/lifecycle/manual.lifecycle.client.vcxproj +++ b/cpp/demo/Manual/lifecycle/manual.lifecycle.client.vcxproj @@ -90,7 +90,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile> @@ -121,7 +121,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile> @@ -147,7 +147,7 @@ <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <TreatWarningAsError>true</TreatWarningAsError> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> @@ -179,7 +179,7 @@ <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <TreatWarningAsError>true</TreatWarningAsError> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> @@ -259,4 +259,4 @@ <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="3.6" ZerocIce_OutputDir=".\generated\client" /> </VisualStudio> </ProjectExtensions> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/demo/Manual/lifecycle/manual.lifecycle.server.vcxproj b/cpp/demo/Manual/lifecycle/manual.lifecycle.server.vcxproj index 8015e1b9851..a59d02941b1 100644 --- a/cpp/demo/Manual/lifecycle/manual.lifecycle.server.vcxproj +++ b/cpp/demo/Manual/lifecycle/manual.lifecycle.server.vcxproj @@ -90,7 +90,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile> @@ -121,7 +121,7 @@ <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile> @@ -147,7 +147,7 @@ <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <TreatWarningAsError>true</TreatWarningAsError> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> @@ -179,7 +179,7 @@ <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <TreatWarningAsError>true</TreatWarningAsError> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> @@ -230,4 +230,4 @@ <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="3.6" ZerocIce_OutputDir=".\generated\server" /> </VisualStudio> </ProjectExtensions> -</Project>
\ No newline at end of file +</Project> |