From be0136874f0f9cdaf759126b1bbb85aa09a36f4e Mon Sep 17 00:00:00 2001 From: nick black Date: Wed, 7 Oct 2020 04:20:26 -0400 Subject: [PATCH] rename Plane::putwc -> Plane::putwch to not conflict with stdlib macro #1046 --- include/ncpp/Plane.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ncpp/Plane.hh b/include/ncpp/Plane.hh index 871dac7fc..1272fedd4 100644 --- a/include/ncpp/Plane.hh +++ b/include/ncpp/Plane.hh @@ -482,13 +482,13 @@ namespace ncpp // OK, this is ugly, but we need to rename this overload or calls similar to n->putc (0, 0, '0') will be // considered ambiguous with the above `putc (int, int, char)` overload. - int putwc (int y, int x, wchar_t w) const NOEXCEPT_MAYBE + int putwch (int y, int x, wchar_t w) const NOEXCEPT_MAYBE { return error_guard (ncplane_putwc_yx (plane, y, x, w), -1); } // Ditto - int putwc (wchar_t w) const NOEXCEPT_MAYBE + int putwch (wchar_t w) const NOEXCEPT_MAYBE { return error_guard (ncplane_putwc (plane, w), -1); }