And guard `<cuchar>` too, why not... closes #16 · feiyunwill/cppfront@b9bbbd8 · GitHub

feiyunwill / cppfront Public

forked from hsutter/cppfront

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit b9bbbd8

Browse filesBrowse the repository at this point in the historyBrowse files

hsutter

committed

And guard <cuchar> too, why not... closes hsutter#16

I was trying to rely on only the named feature tests, but if adding this `__has_include` can unblock someone then let's do it. Also add a `(void)` cast to `~c_raii()` to silence a Clang warning

1 parent 2b96638 commit b9bbbd8
Copy full SHA for b9bbbd8

1 file changed

+4-2Lines changed: 4 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• include
  • cpp2util.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎include/cpp2util.h‎

Copy file name to clipboardExpand all lines: include/cpp2util.h

+4-2Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -106,7 +106,9 @@
106	106	#include <cctype>
107	107	#include <charconv>
108	108	#include <cstring>
109		- #include <cuchar>
	109	+ #if __has_include(<cuchar>)
	110	+ #include <cuchar>
	111	+ #endif
110	112	#include <cwchar>
111	113	#include <cwctype>
112	114	#ifdef __cpp_lib_format
@@ -777,7 +779,7 @@ class c_raii {
777	779	template<typename D>
778	780	c_raii( T t_, D d )
779	781	: t{ t_ }
780		- , dtor{ [](void* x) { (D)(x); } }
	782	+ , dtor{ [](void* x) { (void)(D)(x); } }
781	783	{ }
782	784
783	785	~c_raii() { if (dtor) dtor(t); }

0 commit comments

Comments

0 (0)