Skip to content

fix for MSVC2019 going bonkers about the various struct active #64

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

Open
GerHobbelt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix for MSVC2019 going bonkers about the various struct active #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 19 additions & 13 deletions test/alternative_groups_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,25 @@


//-------------------------------------------------------------------
struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_) :
a{a_}, b{b_}, c{c_}, d{d_}, e{e_}, f{f_}
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c &&
x.d == y.d && x.e == y.e && x.f == y.f );
}
};
namespace alt_groups_test {

struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_) :
a{ a_ }, b{ b_ }, c{ c_ }, d{ d_ }, e{ e_ }, f{ f_ }
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c &&
x.d == y.d && x.e == y.e && x.f == y.f);
}
};

}

using namespace alt_groups_test;


//-------------------------------------------------------------------
Expand Down
34 changes: 20 additions & 14 deletions test/alternative_options_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,26 @@


//-------------------------------------------------------------------
struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_):
a{a_}, b{b_}, c{c_}, d{d_}
{}
bool a = false, b = false, c = false, d = false;
bool conflict = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c &&
x.d == y.d && x.conflict == y.conflict);
}
};
namespace alt_options_test {

struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_) :
a{ a_ }, b{ b_ }, c{ c_ }, d{ d_ }
{}
bool a = false, b = false, c = false, d = false;
bool conflict = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c &&
x.d == y.d && x.conflict == y.conflict);
}
};

}

using namespace alt_options_test;


//-------------------------------------------------------------------
Expand Down
36 changes: 21 additions & 15 deletions test/alternative_required_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,27 @@


//-------------------------------------------------------------------
struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_):
a{a_}, b{b_}, c{c_}, d{d_}
{}
bool a = false, b = false, c = false, d = false;
bool conflict = false;
std::size_t missing = 0;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.conflict == y.conflict && x.missing == y.missing);
}
};
namespace alt_req_test {

struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_) :
a{ a_ }, b{ b_ }, c{ c_ }, d{ d_ }
{}
bool a = false, b = false, c = false, d = false;
bool conflict = false;
std::size_t missing = 0;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.conflict == y.conflict && x.missing == y.missing);
}
};

}

using namespace alt_req_test;


//-------------------------------------------------------------------
Expand Down
34 changes: 20 additions & 14 deletions test/blocking_test01.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,26 @@


//-------------------------------------------------------------------
struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_, int i_ = 0) :
a{a_}, b{b_}, c{c_}, d{d_}, e{e_}, f{f_}, i{i_}
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;
int i = 0;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f && x.i == y.i);
}
};
namespace test01 {

struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_, int i_ = 0) :
a{ a_ }, b{ b_ }, c{ c_ }, d{ d_ }, e{ e_ }, f{ f_ }, i{ i_ }
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;
int i = 0;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f && x.i == y.i);
}
};

}

using namespace test01;


//-------------------------------------------------------------------
Expand Down
35 changes: 21 additions & 14 deletions test/blocking_test02.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,27 @@


//-------------------------------------------------------------------
struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_, int i_ = 0) :
a{a_}, b{b_}, c{c_}, d{d_}, e{e_}, f{f_}, i{i_}
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;
int i = 0;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f && x.i == y.i);
}
};
namespace test02 {

struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_, int i_ = 0) :
a{ a_ }, b{ b_ }, c{ c_ }, d{ d_ }, e{ e_ }, f{ f_ }, i{ i_ }
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;
int i = 0;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f && x.i == y.i);
}
};

}

using namespace test02;



//-------------------------------------------------------------------
Expand Down
34 changes: 20 additions & 14 deletions test/blocking_test03.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,26 @@


//-------------------------------------------------------------------
struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_, int i_ = 0) :
a{a_}, b{b_}, c{c_}, d{d_}, e{e_}, f{f_}, i{i_}
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;
int i = 0;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f && x.i == y.i);
}
};
namespace test03 {

struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_, int i_ = 0) :
a{ a_ }, b{ b_ }, c{ c_ }, d{ d_ }, e{ e_ }, f{ f_ }, i{ i_ }
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;
int i = 0;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f && x.i == y.i);
}
};

}

using namespace test03;


//-------------------------------------------------------------------
Expand Down
32 changes: 19 additions & 13 deletions test/blocking_test04.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,25 @@


//-------------------------------------------------------------------
struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_) :
a{a_}, b{b_}, c{c_}, d{d_}, e{e_}, f{f_}
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f);
}
};
namespace test04 {

struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_) :
a{ a_ }, b{ b_ }, c{ c_ }, d{ d_ }, e{ e_ }, f{ f_ }
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f);
}
};

}

using namespace test04;


//-------------------------------------------------------------------
Expand Down
32 changes: 19 additions & 13 deletions test/blocking_test05.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,25 @@


//-------------------------------------------------------------------
struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_) :
a{a_}, b{b_}, c{c_}, d{d_}, e{e_}, f{f_}
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f);
}
};
namespace test05 {

struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_) :
a{ a_ }, b{ b_ }, c{ c_ }, d{ d_ }, e{ e_ }, f{ f_ }
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f);
}
};

}

using namespace test05;


//-------------------------------------------------------------------
Expand Down
32 changes: 19 additions & 13 deletions test/blocking_test06.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,25 @@


//-------------------------------------------------------------------
struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_) :
a{a_}, b{b_}, c{c_}, d{d_}, e{e_}, f{f_}
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f);
}
};
namespace test06 {

struct active {
active() = default;
explicit
active(bool a_, bool b_, bool c_, bool d_, bool e_, bool f_) :
a{ a_ }, b{ b_ }, c{ c_ }, d{ d_ }, e{ e_ }, f{ f_ }
{}
bool a = false, b = false, c = false, d = false, e = false, f = false;

friend bool operator == (const active& x, const active& y) noexcept {
return (x.a == y.a && x.b == y.b && x.c == y.c && x.d == y.d &&
x.e == y.e && x.f == y.f);
}
};

}

using namespace test06;


//-------------------------------------------------------------------
Expand Down
Loading