diff options
author | socialgraph <socialgraph@yandex-team.com> | 2022-08-10 10:20:58 +0300 |
---|---|---|
committer | socialgraph <socialgraph@yandex-team.com> | 2022-08-10 10:20:58 +0300 |
commit | 07163912675dd114719ec1090ae095355b51ad75 (patch) | |
tree | f1565a4d1ebbf8897749ff2425c14d79ebf43c19 /library/cpp/uri/uri.h | |
parent | a1b5c2e7f704c40f99d96b1df8ccdb75b05a40df (diff) | |
download | ydb-07163912675dd114719ec1090ae095355b51ad75.tar.gz |
ui32 not enough for features flag
Так как добавил новый флаг, отвечающий за оставление хэшбенга, то Feature флаги перестали помещаться в свои прежние 32 бита, то везде поменял long на ui64
Diffstat (limited to 'library/cpp/uri/uri.h')
-rw-r--r-- | library/cpp/uri/uri.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/cpp/uri/uri.h b/library/cpp/uri/uri.h index 3b6c19fe4a8..71fc687fc24 100644 --- a/library/cpp/uri/uri.h +++ b/library/cpp/uri/uri.h @@ -19,7 +19,7 @@ namespace NUri { /********************************************************/ class TUri - : public TFeature, + : public TFeature, public TField, public TScheme, public TState { @@ -354,7 +354,7 @@ namespace NUri { void Merge(const TUri& base, int correctAbs = -1); - TLinkType Normalize(const TUri& base, const TStringBuf& link, const TStringBuf& codebase = TStringBuf(), long careFlags = FeaturesDefault, ECharset enc = CODES_UTF8); + TLinkType Normalize(const TUri& base, const TStringBuf& link, const TStringBuf& codebase = TStringBuf(), ui64 careFlags = FeaturesDefault, ECharset enc = CODES_UTF8); private: int PrintFlags(int flags) const { @@ -543,15 +543,15 @@ namespace NUri { return LinkIsGlobal; } - static IOutputStream& ReEncodeField(IOutputStream& out, const TStringBuf& val, EField fld, long flags = FeaturesEncodeDecode) { + static IOutputStream& ReEncodeField(IOutputStream& out, const TStringBuf& val, EField fld, ui64 flags = FeaturesEncodeDecode) { return NEncode::TEncoder::ReEncode(out, val, NEncode::TEncodeMapper(flags, fld)); } - static IOutputStream& ReEncodeToField(IOutputStream& out, const TStringBuf& val, EField srcfld, long srcflags, EField dstfld, long dstflags) { + static IOutputStream& ReEncodeToField(IOutputStream& out, const TStringBuf& val, EField srcfld, ui64 srcflags, EField dstfld, ui64 dstflags) { return NEncode::TEncoder::ReEncodeTo(out, val, NEncode::TEncodeMapper(srcflags, srcfld), NEncode::TEncodeToMapper(dstflags, dstfld)); } - static IOutputStream& ReEncode(IOutputStream& out, const TStringBuf& val, long flags = FeaturesEncodeDecode) { + static IOutputStream& ReEncode(IOutputStream& out, const TStringBuf& val, ui64 flags = FeaturesEncodeDecode) { return ReEncodeField(out, val, FieldAllMAX, flags); } |