Skip to content

Commit a4eff92

Browse files
committed
Fixed up a few filters and made it clear that the type change for the user_data_key::key_type was a workaround for a known bug in Clang 3.3.
1 parent 93f98fc commit a4eff92

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

N3888_RefImpl/src/N3888_RefImpl.vcxproj.filters

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<Filter Include="Source Files">
@@ -164,16 +164,16 @@
164164
<None Include="win32\DLLs\x86\Debug\cairo.pdb">
165165
<Filter>DLLs</Filter>
166166
</None>
167-
<None Include="DLLs\x86\Debug\zlib1.dll">
167+
<None Include="win32\DLLs\x86\Release\cairo.dll">
168168
<Filter>DLLs</Filter>
169169
</None>
170-
<None Include="DLLs\x86\Debug\zlib1.pdb">
170+
<None Include="win32\DLLs\x86\Debug\zlib1.dll">
171171
<Filter>DLLs</Filter>
172172
</None>
173-
<None Include="DLLs\x86\Release\cairo.dll">
173+
<None Include="win32\DLLs\x86\Release\zlib1.dll">
174174
<Filter>DLLs</Filter>
175175
</None>
176-
<None Include="DLLs\x86\Release\zlib1.dll">
176+
<None Include="win32\DLLs\x86\Debug\zlib1.pdb">
177177
<Filter>DLLs</Filter>
178178
</None>
179179
</ItemGroup>

N3888_RefImpl/src/drawing.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,11 @@ namespace std {
354354

355355
class user_data_key {
356356
public:
357+
#ifdef __clang__ // Workaround for Clang 3.3 not supporting 64-bit atomics on 32-bit GNU/Linux
357358
typedef ::std::int_fast32_t key_type;
359+
#else
360+
typedef ::std::int_fast64_t key_type;
361+
#endif
358362
private:
359363
static ::std::atomic<key_type> _Cnt;
360364
key_type _Val;

0 commit comments

Comments
 (0)