Skip to content

Commit cbc4ba7

Browse files
committed
Merge branch 'v0.1.0-beta' of https://github.com/gammasoft71/xtd into v0.1.0-beta
2 parents 1d13288 + 56aa0ee commit cbc4ba7

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/xtd.core.native.win32/src/xtd/native/win32/console.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace {
3737

3838
int32_t backColor = __background_color();
3939
int32_t foreColor = __foreground_color();
40-
bool treat_control_c_as_input = [&]()-> bool {
40+
bool treat_control_c_as_input = []()-> bool {
4141
SetConsoleCtrlHandler(&__handler_routine, TRUE);
4242
return false;
4343
}();

src/xtd.core/src/xtd/internal/__opaque_console_win32.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace {
3535

3636
xtd::console_color backColor = __background_color();
3737
xtd::console_color foreColor = __foreground_color();
38-
bool treat_control_c_as_input = [&]()-> bool {
38+
bool treat_control_c_as_input = []()-> bool {
3939
SetConsoleCtrlHandler(&__handler_routine, TRUE);
4040
return false;
4141
}();

src/xtd.tunit/include/xtd/tunit/assert.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ namespace xtd {
661661
}
662662

663663
static void contains(char8_t item, const char8_t* values, const xtd::ustring& message, const xtd::diagnostics::stack_frame& stack_frame) {
664-
ustring s(values);
664+
std::u8string s(values);
665665
auto result = std::find(s.begin(), s.end(), item);
666666
if (result != s.end())
667667
succeed(message, stack_frame);
@@ -670,7 +670,7 @@ namespace xtd {
670670
}
671671

672672
static void contains(char16_t item, const char16_t* values, const xtd::ustring& message, const xtd::diagnostics::stack_frame& stack_frame) {
673-
ustring s(values);
673+
std::u16string s(values);
674674
auto result = std::find(s.begin(), s.end(), item);
675675
if (result != s.end())
676676
succeed(message, stack_frame);
@@ -679,7 +679,7 @@ namespace xtd {
679679
}
680680

681681
static void contains(char32_t item, const char32_t* values, const xtd::ustring& message, const xtd::diagnostics::stack_frame& stack_frame) {
682-
ustring s(values);
682+
std::u32string s(values);
683683
auto result = std::find(s.begin(), s.end(), item);
684684
if (result != s.end())
685685
succeed(message, stack_frame);
@@ -688,7 +688,7 @@ namespace xtd {
688688
}
689689

690690
static void contains(wchar_t item, const wchar_t* values, const xtd::ustring& message, const xtd::diagnostics::stack_frame& stack_frame) {
691-
ustring s(values);
691+
std::wstring s(values);
692692
auto result = std::find(s.begin(), s.end(), item);
693693
if (result != s.end())
694694
succeed(message, stack_frame);

0 commit comments

Comments
 (0)