Fix pointer declaration. See #177
diff --git a/src/main/include/log4cxx/config/propertysetter.h b/src/main/include/log4cxx/config/propertysetter.h index d49a1c7..072a327 100644 --- a/src/main/include/log4cxx/config/propertysetter.h +++ b/src/main/include/log4cxx/config/propertysetter.h
@@ -26,10 +26,17 @@ namespace helpers { class Object; -// Instantiate template pointer type passed as parameter -LOG4CXX_INSTANTIATE_EXPORTED_PTR(Object); LOG4CXX_PTR_DEF(Object); +} +} +// Instantiate template pointer type passed as parameter +LOG4CXX_INSTANTIATE_EXPORTED_PTR(LOG4CXX_NS::helpers::Object); + +namespace LOG4CXX_NS +{ +namespace helpers +{ class Properties; class Pool; }
diff --git a/src/main/include/log4cxx/helpers/inputstreamreader.h b/src/main/include/log4cxx/helpers/inputstreamreader.h index 5addcc9..822748a 100644 --- a/src/main/include/log4cxx/helpers/inputstreamreader.h +++ b/src/main/include/log4cxx/helpers/inputstreamreader.h
@@ -22,16 +22,16 @@ #include <log4cxx/helpers/inputstream.h> #include <log4cxx/helpers/charsetdecoder.h> +// Instantiate template pointer types passed as parameters +LOG4CXX_INSTANTIATE_EXPORTED_PTR(LOG4CXX_NS::helpers::InputStream); +LOG4CXX_INSTANTIATE_EXPORTED_PTR(LOG4CXX_NS::helpers::CharsetDecoder); + namespace LOG4CXX_NS { namespace helpers { -// Instantiate template pointer types passed as parameters -LOG4CXX_INSTANTIATE_EXPORTED_PTR(InputStream); -LOG4CXX_INSTANTIATE_EXPORTED_PTR(CharsetDecoder); - /** * Class for reading from character streams. * Decorates a byte based InputStream and provides appropriate
diff --git a/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h b/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h index 8b4310f..de7b22f 100644 --- a/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h +++ b/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h
@@ -21,6 +21,9 @@ #include <log4cxx/rolling/triggeringpolicy.h> #include <log4cxx/spi/filter.h> +// Instantiate template pointer types passed as parameters +LOG4CXX_INSTANTIATE_EXPORTED_PTR(LOG4CXX_NS::spi::Filter); + namespace LOG4CXX_NS { @@ -35,9 +38,6 @@ namespace rolling { -// Instantiate template pointer types passed as parameters -LOG4CXX_INSTANTIATE_EXPORTED_PTR(LOG4CXX_NS::spi::Filter); - /** * FilterBasedTriggeringPolicy determines if rolling should be triggered * by evaluating the current message against a set of filters. Unless a