Skip to content

Commit 66a2304

Browse files
author
Valtteri Heikkila
committed
Merge remote-tracking branch 'remotes/upstream/development' into development
2 parents 224c1fe + 85cca3f commit 66a2304

File tree

10 files changed

+60
-23
lines changed

10 files changed

+60
-23
lines changed

‎Build/Common.Build.settings

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,23 @@
1515
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1616
</PropertyGroup>
1717

18+
<!-- for Visual Leak Detector -->
19+
<ItemDefinitionGroup Condition="'$(CASA_ENABLE_VLD)' != ''">
20+
<ClCompile>
21+
<AdditionalOptions>/DCASA_ENABLE_VLD %(AdditionalOptions)</AdditionalOptions>
22+
</ClCompile>
23+
</ItemDefinitionGroup>
24+
<ItemDefinitionGroup Condition="'$(CASA_ENABLE_VLD)' != '' AND '$(Platform)'=='Win32'">
25+
<Link>
26+
<AdditionalLibraryDirectories>"C:\Program Files (x86)\Visual Leak Detector\lib\Win32";%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
27+
</Link>
28+
</ItemDefinitionGroup>
29+
<ItemDefinitionGroup Condition="'$(CASA_ENABLE_VLD)' != '' AND '$(Platform)'=='x64'">
30+
<Link>
31+
<AdditionalLibraryDirectories>"C:\Program Files (x86)\Visual Leak Detector\lib\Win64";%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
32+
</Link>
33+
</ItemDefinitionGroup>
34+
1835
<!-- for root paths -->
1936
<PropertyGroup>
2037
<BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>

‎Release/include/compat/apple_compat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ typedef struct _SYSTEMTIME {
8484

8585
#define YieldProcessor() __asm__ __volatile__ ("pause")
8686

87-
#define UNREFERENCED_PARAMETER(x) (void)x
87+
#define CASABLANCA_UNREFERENCED_PARAMETER(x) (void)x
8888
#define _ASSERTE(x) assert(x)
8989

9090
#ifdef CASABLANCA_DEPRECATION_NO_WARNINGS

‎Release/src/utilities/asyncrt_utils.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ using namespace boost::locale::conv;
4040
#include <CoreFoundation/CoreFoundation.h>
4141
#endif
4242

43+
// For more details see https://casablanca.codeplex.com/wikipage?title=Running%20Leak%20Detection&IsNewlyCreatedPage=true
44+
#if defined(CASA_ENABLE_VLD)
45+
#include "C:/Program Files (x86)/Visual Leak Detector/include/vld.h"
46+
#endif
47+
4348
using namespace web;
4449
using namespace utility;
4550
using namespace utility::conversions;

‎Release/tests/Common/TestRunner/VS11/TestRunner110.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<Link>
138138
<SubSystem>Console</SubSystem>
139139
<GenerateDebugInformation>true</GenerateDebugInformation>
140-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
140+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
141141
</Link>
142142
</ItemDefinitionGroup>
143143
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -153,7 +153,7 @@
153153
<Link>
154154
<SubSystem>Console</SubSystem>
155155
<GenerateDebugInformation>true</GenerateDebugInformation>
156-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
156+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157157
</Link>
158158
</ItemDefinitionGroup>
159159
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -169,7 +169,7 @@
169169
<Link>
170170
<SubSystem>Console</SubSystem>
171171
<GenerateDebugInformation>true</GenerateDebugInformation>
172-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
172+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
173173
</Link>
174174
</ItemDefinitionGroup>
175175
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -189,7 +189,7 @@
189189
<GenerateDebugInformation>true</GenerateDebugInformation>
190190
<EnableCOMDATFolding>true</EnableCOMDATFolding>
191191
<OptimizeReferences>true</OptimizeReferences>
192-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
192+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
193193
</Link>
194194
</ItemDefinitionGroup>
195195
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -209,7 +209,7 @@
209209
<GenerateDebugInformation>true</GenerateDebugInformation>
210210
<EnableCOMDATFolding>true</EnableCOMDATFolding>
211211
<OptimizeReferences>true</OptimizeReferences>
212-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
212+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
213213
</Link>
214214
</ItemDefinitionGroup>
215215
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -229,7 +229,7 @@
229229
<GenerateDebugInformation>true</GenerateDebugInformation>
230230
<EnableCOMDATFolding>true</EnableCOMDATFolding>
231231
<OptimizeReferences>true</OptimizeReferences>
232-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
232+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
233233
</Link>
234234
</ItemDefinitionGroup>
235235
<ItemGroup>

‎Release/tests/Common/TestRunner/vs12.winrt/TestRunner120.winrt.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<Link>
139139
<SubSystem>Console</SubSystem>
140140
<GenerateDebugInformation>true</GenerateDebugInformation>
141-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
141+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
142142
</Link>
143143
</ItemDefinitionGroup>
144144
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -154,7 +154,7 @@
154154
<Link>
155155
<SubSystem>Console</SubSystem>
156156
<GenerateDebugInformation>true</GenerateDebugInformation>
157-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
157+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
158158
</Link>
159159
</ItemDefinitionGroup>
160160
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -170,7 +170,7 @@
170170
<Link>
171171
<SubSystem>Console</SubSystem>
172172
<GenerateDebugInformation>true</GenerateDebugInformation>
173-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
173+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
174174
</Link>
175175
</ItemDefinitionGroup>
176176
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -190,7 +190,7 @@
190190
<GenerateDebugInformation>true</GenerateDebugInformation>
191191
<EnableCOMDATFolding>true</EnableCOMDATFolding>
192192
<OptimizeReferences>true</OptimizeReferences>
193-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
193+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
194194
</Link>
195195
</ItemDefinitionGroup>
196196
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -210,7 +210,7 @@
210210
<GenerateDebugInformation>true</GenerateDebugInformation>
211211
<EnableCOMDATFolding>true</EnableCOMDATFolding>
212212
<OptimizeReferences>true</OptimizeReferences>
213-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
213+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
214214
</Link>
215215
</ItemDefinitionGroup>
216216
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -230,7 +230,7 @@
230230
<GenerateDebugInformation>true</GenerateDebugInformation>
231231
<EnableCOMDATFolding>true</EnableCOMDATFolding>
232232
<OptimizeReferences>true</OptimizeReferences>
233-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
233+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
234234
</Link>
235235
</ItemDefinitionGroup>
236236
<ItemGroup>

‎Release/tests/Common/TestRunner/vs12/TestRunner120.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<Link>
139139
<SubSystem>Console</SubSystem>
140140
<GenerateDebugInformation>true</GenerateDebugInformation>
141-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
141+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
142142
</Link>
143143
</ItemDefinitionGroup>
144144
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -154,7 +154,7 @@
154154
<Link>
155155
<SubSystem>Console</SubSystem>
156156
<GenerateDebugInformation>true</GenerateDebugInformation>
157-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
157+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
158158
</Link>
159159
</ItemDefinitionGroup>
160160
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -170,7 +170,7 @@
170170
<Link>
171171
<SubSystem>Console</SubSystem>
172172
<GenerateDebugInformation>true</GenerateDebugInformation>
173-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
173+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
174174
</Link>
175175
</ItemDefinitionGroup>
176176
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -190,7 +190,7 @@
190190
<GenerateDebugInformation>true</GenerateDebugInformation>
191191
<EnableCOMDATFolding>true</EnableCOMDATFolding>
192192
<OptimizeReferences>true</OptimizeReferences>
193-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
193+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
194194
</Link>
195195
</ItemDefinitionGroup>
196196
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -210,7 +210,7 @@
210210
<GenerateDebugInformation>true</GenerateDebugInformation>
211211
<EnableCOMDATFolding>true</EnableCOMDATFolding>
212212
<OptimizeReferences>true</OptimizeReferences>
213-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
213+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
214214
</Link>
215215
</ItemDefinitionGroup>
216216
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -230,7 +230,7 @@
230230
<GenerateDebugInformation>true</GenerateDebugInformation>
231231
<EnableCOMDATFolding>true</EnableCOMDATFolding>
232232
<OptimizeReferences>true</OptimizeReferences>
233-
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
233+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
234234
</Link>
235235
</ItemDefinitionGroup>
236236
<ItemGroup>

‎Release/tests/Common/UnitTestpp/unittestpp.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,13 @@
4040
#include "src/GlobalSettings.h"
4141

4242
#endif
43+
44+
// For more details see https://casablanca.codeplex.com/wikipage?title=Running%20Leak%20Detection&IsNewlyCreatedPage=true
45+
#if defined(CASA_ENABLE_VLD)
46+
#include "C:/Program Files (x86)/Visual Leak Detector/include/vld.h"
47+
48+
// vld.h pulls in Windows.h
49+
#undef max
50+
#undef min
51+
52+
#endif

‎Release/tests/Common/utilities/stdafx.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,8 @@
3434
#include <Windows.h>
3535

3636
#endif
37+
38+
// For more details see https://casablanca.codeplex.com/wikipage?title=Running%20Leak%20Detection&IsNewlyCreatedPage=true
39+
#if defined(CASA_ENABLE_VLD)
40+
#include "C:/Program Files (x86)/Visual Leak Detector/include/vld.h"
41+
#endif

‎Release/tests/Functional/json/VS11.xp/JSON110_test.xp.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<Link>
8888
<SubSystem>Console</SubSystem>
8989
<GenerateDebugInformation>true</GenerateDebugInformation>
90-
<AdditionalLibraryDirectories>$(OutDir)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
90+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9191
</Link>
9292
</ItemDefinitionGroup>
9393
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -100,7 +100,7 @@
100100
<Link>
101101
<SubSystem>Console</SubSystem>
102102
<GenerateDebugInformation>true</GenerateDebugInformation>
103-
<AdditionalLibraryDirectories>$(OutDir)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
103+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
104104
</Link>
105105
</ItemDefinitionGroup>
106106
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

‎Release/tests/Functional/json/VS11/JSON110_test.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<Link>
8888
<SubSystem>Console</SubSystem>
8989
<GenerateDebugInformation>true</GenerateDebugInformation>
90-
<AdditionalLibraryDirectories>$(OutDir)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
90+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9191
</Link>
9292
</ItemDefinitionGroup>
9393
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -100,7 +100,7 @@
100100
<Link>
101101
<SubSystem>Console</SubSystem>
102102
<GenerateDebugInformation>true</GenerateDebugInformation>
103-
<AdditionalLibraryDirectories>$(OutDir)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
103+
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
104104
</Link>
105105
</ItemDefinitionGroup>
106106
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

0 commit comments

Comments
 (0)