Silence abi_check

Author: stephen-webb

src/main/cpp/outputstreamwriter.cpp

@@ -41,7 +41,7 @@ struct OutputStreamWriter::OutputStreamWriterPrivate
 	CharsetEncoderPtr enc;
 };
 
-OutputStreamWriter::OutputStreamWriter(const OutputStreamPtr& out)
+OutputStreamWriter::OutputStreamWriter(LOG4CXX_16_CONST OutputStreamPtr& out)
 	: m_priv(std::make_unique<OutputStreamWriterPrivate>(out))
 {
 	if (!out)
@@ -51,8 +51,8 @@ OutputStreamWriter::OutputStreamWriter(const OutputStreamPtr& out)
 }
 
 OutputStreamWriter::OutputStreamWriter
-	( const OutputStreamPtr& out
-	, const CharsetEncoderPtr& enc
+	( LOG4CXX_16_CONST OutputStreamPtr& out
+	, LOG4CXX_16_CONST CharsetEncoderPtr& enc
 	)
 	: m_priv(std::make_unique<OutputStreamWriterPrivate>(out, enc))
 {

src/main/include/log4cxx/helpers/outputstreamwriter.h

@@ -22,6 +22,12 @@
 #include <log4cxx/helpers/outputstream.h>
 #include <log4cxx/helpers/charsetencoder.h>
 
+#if 15 < LOG4CXX_ABI_VERSION
+#define LOG4CXX_16_CONST const
+#else
+#define LOG4CXX_16_CONST 
+#endif
+
 namespace LOG4CXX_NS
 {
 
@@ -43,8 +49,8 @@ class LOG4CXX_EXPORT OutputStreamWriter : public Writer
 		LOG4CXX_CAST_ENTRY_CHAIN(Writer)
 		END_LOG4CXX_CAST_MAP()
 
-		OutputStreamWriter(const OutputStreamPtr& out);
-		OutputStreamWriter(const OutputStreamPtr& out, const CharsetEncoderPtr& enc);
+		OutputStreamWriter(LOG4CXX_16_CONST OutputStreamPtr& out);
+		OutputStreamWriter(LOG4CXX_16_CONST OutputStreamPtr& out, LOG4CXX_16_CONST CharsetEncoderPtr& enc);
 		~OutputStreamWriter();
 
 		void close(Pool& p) override;

src/main/include/log4cxx/writerappender.h

@@ -22,12 +22,6 @@
 #include <log4cxx/helpers/outputstreamwriter.h>
 #include <atomic>
 
-#if 15 < LOG4CXX_ABI_VERSION
-#define LOG4CXX_16_CONST const
-#else
-#define LOG4CXX_16_CONST 
-#endif
-
 namespace LOG4CXX_NS
 {