From 99b66c9c933af61e05ae59122491d5aadea52734 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 12 Nov 2018 14:42:14 +0100 Subject: xdrstream: use more descriptive template arg name --- include/object/xdrstream.h | 4 ++-- src/os/object/xdrstream.cc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/object/xdrstream.h b/include/object/xdrstream.h index 432f952..2e46cad 100644 --- a/include/object/xdrstream.h +++ b/include/object/xdrstream.h @@ -30,7 +30,7 @@ class XDRStream { XDRStream & operator<<(unsigned long long number); XDRStream & operator<<(long long number); XDRStream & operator<<(char const *text); - template XDRStream & operator<<(char const (&text)[N]); + template XDRStream & operator<<(char const (&text)[TSize]); XDRStream & operator<<(XDRStream & (*fun) (XDRStream &)); }; @@ -41,7 +41,7 @@ XDRStream & flush(XDRStream & os); // TERM: zero-termination XDRStream & term(XDRStream & os); -template +template XDRStream & opaque(XDRStream & os); XDRStream & fixed(XDRStream & os); diff --git a/src/os/object/xdrstream.cc b/src/os/object/xdrstream.cc index d7a5ace..92de986 100644 --- a/src/os/object/xdrstream.cc +++ b/src/os/object/xdrstream.cc @@ -82,13 +82,13 @@ XDRStream & XDRStream::operator<<(char const *data){ return *this; } -template -XDRStream & XDRStream::operator<<(char const (&data)[N]){ +template +XDRStream & XDRStream::operator<<(char const (&data)[TSize]){ if (!is_fixed_length) { - *this << N; + *this << TSize; } uint32_t i; - for (i = 0; i < N; i++) { + for (i = 0; i < TSize; i++) { put(data[i]); } while ((i++) % 4 != 0){ -- cgit v1.2.3