diff options
| author | Neil MacIntosh <neilmac@microsoft.com> | 2016-09-06 18:50:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 18:50:32 -0700 |
| commit | d23f4d931c98c074ebe90bebf609c397589bf7b9 (patch) | |
| tree | 8dd1cbe3175f1118379972fcfbe12f5873952172 | |
| parent | a360b81805845ce52a77095f5547a1eb2e261efd (diff) | |
| parent | 9e0807f1b1f1d383d67a6a23afbe69b6ab594b20 (diff) | |
| download | platform_external_Microsoft-GSL-d23f4d931c98c074ebe90bebf609c397589bf7b9.tar.gz platform_external_Microsoft-GSL-d23f4d931c98c074ebe90bebf609c397589bf7b9.tar.bz2 platform_external_Microsoft-GSL-d23f4d931c98c074ebe90bebf609c397589bf7b9.zip | |
Fix #350 typo in operator | for gsl::byte.
| -rw-r--r-- | gsl/gsl_byte | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gsl/gsl_byte b/gsl/gsl_byte index 91ce9d2..5134032 100644 --- a/gsl/gsl_byte +++ b/gsl/gsl_byte @@ -75,7 +75,7 @@ constexpr byte& operator|=(byte& l, byte r) noexcept constexpr byte operator|(byte l, byte r) noexcept { - return byte(static_cast<unsigned char>(l) + static_cast<unsigned char>(r)); + return byte(static_cast<unsigned char>(l) | static_cast<unsigned char>(r)); } constexpr byte& operator&=(byte& l, byte r) noexcept |