diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/curs_char/curs_char.cpp | 12 | ||||
| -rw-r--r-- | tests/multiflags/multiflags.cpp | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/tests/curs_char/curs_char.cpp b/tests/curs_char/curs_char.cpp index a076e89..f9a924e 100644 --- a/tests/curs_char/curs_char.cpp +++ b/tests/curs_char/curs_char.cpp @@ -1,4 +1,6 @@ #include <cassert> +#include <iostream> + #define NCURSES_CPP_CHAR_VALUE_AS_PUBLIC #include <ncurses.h> @@ -101,28 +103,28 @@ int main(int argc, char *argv[]) { { curs_char c = 'a'; c |= (attr::altcharset | attr::blink); - assert(c.value_ == ('a' & (A_ALTCHARSET | A_BLINK))); + assert(c.value_ == ('a' | (A_ALTCHARSET | A_BLINK))); } { curs_char c = 'a'; c ^= (attr::altcharset | attr::blink); - assert(c.value_ == ('a' & (A_ALTCHARSET | A_BLINK))); + assert(c.value_ == ('a' ^ (A_ALTCHARSET | A_BLINK))); } // # With color_pair { curs_char c = 'a'; c &= color_pair(7); - assert(c.value_ == ('a' & (COLOR_PAIR(10)))); + assert(c.value_ == ('a' & (COLOR_PAIR(7)))); } { curs_char c = 'a'; c |= color_pair(7); - assert(c.value_ == ('a' | (COLOR_PAIR(10)))); + assert(c.value_ == ('a' | (COLOR_PAIR(7)))); } { curs_char c = 'a'; c ^= color_pair(7); - assert(c.value_ == ('a' ^ (COLOR_PAIR(10)))); + assert(c.value_ == ('a' ^ (COLOR_PAIR(7)))); } // // # With full_attrs diff --git a/tests/multiflags/multiflags.cpp b/tests/multiflags/multiflags.cpp index e689892..f1ff442 100644 --- a/tests/multiflags/multiflags.cpp +++ b/tests/multiflags/multiflags.cpp @@ -8,9 +8,9 @@ using namespace ncurses; -template <> struct is_applyable<color_pair, attr> : std::true_type {}; +template <> struct ncurses::is_applyable<color_pair, attr> : std::true_type {}; -using full_attrs = multiflags<attr, color_pair>; +using full_attrs = ncurses::multiflags<attr, color_pair>; int main(int argc, char *argv[]) { { |