diff options
| author | Antony Woods <acron1@gmail.com> | 2014-10-14 18:25:22 +0100 |
|---|---|---|
| committer | Antony Woods <acron1@gmail.com> | 2014-10-14 18:25:22 +0100 |
| commit | 6a2def410cc2559aeb7a9d34821b5d195672fb3b (patch) | |
| tree | de0733229c28f9ef706bafd5276d9d200c573281 /include/utility.h | |
| parent | 06842721d7da53a2235e6e4071760588ec285f90 (diff) | |
| parent | a5fab23f70e6e33c633ba4b646a41d0851169ad1 (diff) | |
| download | crow-6a2def410cc2559aeb7a9d34821b5d195672fb3b.tar.gz crow-6a2def410cc2559aeb7a9d34821b5d195672fb3b.zip | |
Fixed merge oddities
Diffstat (limited to 'include/utility.h')
| -rw-r--r-- | include/utility.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/utility.h b/include/utility.h index b2e61f1..c910eb2 100644 --- a/include/utility.h +++ b/include/utility.h @@ -67,7 +67,9 @@ namespace crow constexpr bool is_equ_p(const char* a, const char* b, unsigned n) { return - *a == 0 || *b == 0 + *a == 0 && *b == 0 && n == 0 + ? true : + (*a == 0 || *b == 0) ? false : n == 0 ? true : |