[Pkg-voip-commits] [bctoolbox] 14/57: fix again compilation issue

[daniel at gnoutcheff.name]

This is an automated email from the git hooks/post-receive script.

gnoutchd-guest pushed a commit to branch debian/sid
in repository bctoolbox.

commit e76f4b81f93b9942ed68ca0a1e008cd97cabb282
Author: Simon Morlat <simon.morlat at linphone.org>
Date:   Sat Nov 19 14:35:50 2016 +0100

    fix again compilation issue
---
 include/bctoolbox/logging.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/bctoolbox/logging.h b/include/bctoolbox/logging.h
index cc63f72..de2b70b 100644
--- a/include/bctoolbox/logging.h
+++ b/include/bctoolbox/logging.h
@@ -208,7 +208,7 @@ namespace bctoolbox {
 	}
 }
 
-#if __cplusplus > 199711L  /*if compiled with C++11 support*/
+
 
 #include <ostream>
 
@@ -222,7 +222,7 @@ struct pumpstream : public std::ostringstream {
 	}
 };
 
-#if (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+#if (__GNUC__ == 4 && __GNUC_MINOR__ < 5 && __cplusplus > 199711L)
 template <typename _Tp> inline pumpstream &operator<<(pumpstream &&__os, const _Tp &__x) {
 	(static_cast<std::ostringstream &>(__os)) << __x;
 	return __os;
@@ -239,7 +239,6 @@ if (bctbx_log_level_enabled((domain), (thelevel))) \
 #define BCTBX_SLOGW(DOMAIN) BCTBX_SLOG(DOMAIN, BCTBX_LOG_WARNING)
 #define BCTBX_SLOGE(DOMAIN) BCTBX_SLOG(DOMAIN, BCTBX_LOG_ERROR)
 
-#endif  /*c++11*/
 
 #endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/bctoolbox.git