From 6d71b7306368e8a68fc68e73bd2e5b5971cbbb2b Mon Sep 17 00:00:00 2001 From: Carl Lei Date: Sat, 25 Jun 2016 18:44:06 +0800 Subject: [PATCH 1/2] portability fix for FIONREAD on Solaris --- src/tcpoutbuffer.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tcpoutbuffer.h b/src/tcpoutbuffer.h index 1bbfa4d..6ebd5fa 100644 --- a/src/tcpoutbuffer.h +++ b/src/tcpoutbuffer.h @@ -19,6 +19,13 @@ #include #include +/** + * FIONREAD on Solaris is defined elsewhere + */ +#ifdef __sun +#include +#endif + /** * Set up namespace */ From 55aba43078a22181d7e14980cc19bdac996b6a8b Mon Sep 17 00:00:00 2001 From: Carl Lei Date: Sat, 25 Jun 2016 18:51:10 +0800 Subject: [PATCH 2/2] portability fix for pow overload resolution On Solaris the compiler is missing the template overload. --- include/decimalfield.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/decimalfield.h b/include/decimalfield.h index aa1f842..be26496 100644 --- a/include/decimalfield.h +++ b/include/decimalfield.h @@ -108,7 +108,7 @@ public: virtual void output(std::ostream &stream) const override { // output floating point value - stream << "decimal(" << _number / pow(10, _places) << ")"; + stream << "decimal(" << _number / pow(10.0f, _places) << ")"; } /** @@ -138,7 +138,7 @@ public: */ virtual operator double() const override { - return _number / pow(10, _places); + return _number / pow(10.0f, _places); } /** @@ -149,7 +149,7 @@ public: */ virtual operator float() const override { - return static_cast(_number / pow(10, _places)); + return static_cast(_number / pow(10.0f, _places)); } /**