Skip to content

<xhash> should avoid including <xstring> #2996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Stephan T. Lavavej (StephanTLavavej) merged 2 commits into from
Aug 7, 2022
Merged

<xhash> should avoid including <xstring> #2996

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bf6309
Stop dragging stdext::hash_compare into std.
StephanTLavavej Aug 5, 2022
65df428
xhash should include string machinery only when hash_meow is enabled.
StephanTLavavej Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions stl/inc/xhash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@
#include <yvals_core.h>
#if _STL_COMPILER_PREPROCESSOR
#include <cmath>
#include <cstring>
#include <cwchar>
#include <list>
#include <tuple>
#include <vector>
#include <xbit_ops.h>

#ifdef _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
#include <cstring>
#include <cwchar>
#include <xstring>
#endif // _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS

#if _HAS_CXX17
#include <xnode_handle.h>
Expand All @@ -28,6 +31,7 @@ _STL_DISABLE_CLANG_WARNINGS
#pragma push_macro("new")
#undef new

#ifdef _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
namespace stdext {
using _STD basic_string;
using _STD less;
Expand Down Expand Up @@ -86,10 +90,9 @@ namespace stdext {
_Pr comp{}; // the comparator object
};
} // namespace stdext
#endif // _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS

_STD_BEGIN
using stdext::hash_compare; // TRANSITION, protobuf used this until v3.7.0, released Feb 28, 2019

template <class _Kty, class _Hasher, class _Keyeq, class = void>
struct _Uhash_choose_transparency {
// transparency selector for non-transparent hashed containers
Expand Down