Skip to content

Commit 974229b

Browse files
committed
Merge branch 'fix_passing_arguments' - resolved conflict in StringBase constructors
1 parent d3d0952 commit 974229b

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

src/common/classes/fb_string.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,8 @@ namespace Firebird
695695
StringBase(const void* s, size_type n) : AbstractString(Comparator::getMaxLength(), n, s) {}
696696
StringBase(const_pointer s) :
697697
AbstractString(Comparator::getMaxLength(), s ? length(s) : 0, s) {}
698+
StringBase(std::string_view sv) :
699+
AbstractString(Comparator::getMaxLength(), static_cast<size_type>(sv.length()), sv.data()) {}
698700
explicit StringBase(const unsigned char* s) :
699701
AbstractString(Comparator::getMaxLength(), length((char*) s), (char*) s) {}
700702
StringBase(const MetaString& v) : AbstractString(Comparator::getMaxLength(), v) {}

0 commit comments

Comments
 (0)