aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-02-04 15:42:09 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-02-04 16:00:03 +0300
commitc8fcaec72a30dd30cb560f44b8d3632cc57153f5 (patch)
tree02e8c8e4322617622e5099b3725f8b3f3edb30be
parentca9ba3420874590fd699da706c021cc13bb52be5 (diff)
downloadydb-c8fcaec72a30dd30cb560f44b8d3632cc57153f5.tar.gz
Clarify wrl headers resolution
-rw-r--r--build/sysincl/unsorted.yml7
-rw-r--r--build/sysincl/windows.yml18
-rw-r--r--contrib/restricted/boost/thread/src/win32/thread.cpp8
3 files changed, 15 insertions, 18 deletions
diff --git a/build/sysincl/unsorted.yml b/build/sysincl/unsorted.yml
index 93e2e994674..fb93432e6af 100644
--- a/build/sysincl/unsorted.yml
+++ b/build/sysincl/unsorted.yml
@@ -543,10 +543,6 @@
#endif
- asm/page.h
- asm/sgidefs.h
- - wrl\client.h
- - wrl\event.h
- - wrl\wrappers\corewrappers.h
- - wrl\ftm.h
- bits/char_traits.h
- bits/stl_algobase.h
- bits/stl_move.h
@@ -825,11 +821,8 @@
- mpeix/mpeixish.h
- epocish.h
- beos/beosish.h
- - WinNT.h
- ../../VC/include/stdio.h
- ../ucrt/stdio.h
- - Activation.h
- - Windows.System.Threading.h
#if defined(__MINGW32__) || defined(_MSC_VER)
- inet_net_pton.h
- inet_ntop.h
diff --git a/build/sysincl/windows.yml b/build/sysincl/windows.yml
index a2544cb3839..7c9f3f1ab04 100644
--- a/build/sysincl/windows.yml
+++ b/build/sysincl/windows.yml
@@ -303,13 +303,6 @@
- winwlx.h
- wnnc.h
- wow64apiset.h
- - wrl.h
- - wrl/async.h
- - wrl/client.h
- - wrl/event.h
- - wrl/ftm.h
- - wrl/implements.h
- - wrl/wrappers/corewrappers.h
- ws2bth.h
- ws2def.h
- ws2ipdef.h
@@ -323,3 +316,14 @@
- xaudio2.h
- xinput.h
- xmllite.h
+
+# These headers belong to UWP application development.
+- case_sensitive: false
+ includes:
+ - wrl.h
+ - wrl/async.h
+ - wrl/client.h
+ - wrl/event.h
+ - wrl/ftm.h
+ - wrl/implements.h
+ - wrl/wrappers/corewrappers.h
diff --git a/contrib/restricted/boost/thread/src/win32/thread.cpp b/contrib/restricted/boost/thread/src/win32/thread.cpp
index 000ab8779da..45c2651fbf6 100644
--- a/contrib/restricted/boost/thread/src/win32/thread.cpp
+++ b/contrib/restricted/boost/thread/src/win32/thread.cpp
@@ -34,10 +34,10 @@
#include <mutex>
#include <atomic>
#include <Activation.h>
-#include <wrl\client.h>
-#include <wrl\event.h>
-#include <wrl\wrappers\corewrappers.h>
-#include <wrl\ftm.h>
+#include <wrl/client.h>
+#include <wrl/event.h>
+#include <wrl/wrappers/corewrappers.h>
+#include <wrl/ftm.h>
#include <windows.system.threading.h>
#pragma comment(lib, "runtimeobject.lib")
#endif