You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/01/28 18:48:45 UTC
svn commit: r615969 - in /logging/log4cxx/trunk/src/main/include/log4cxx:
asyncappender.h logger.h propertyconfigurator.h
spi/hierarchyeventlistener.h spi/loggerfactory.h spi/loggerrepository.h
Author: carnold
Date: Mon Jan 28 09:48:41 2008
New Revision: 615969
URL: http://svn.apache.org/viewvc?rev=615969&view=rev
Log:
LOGCXX-219: Fix header check errors
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/logger.h
logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerfactory.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h?rev=615969&r1=615968&r2=615969&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h Mon Jan 28 09:48:41 2008
@@ -190,6 +190,8 @@
private:
+ AsyncAppender(const AsyncAppender&);
+ AsyncAppender& operator=(const AsyncAppender&);
/**
* The default buffer size is set to 128 events.
*/
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/logger.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/logger.h?rev=615969&r1=615968&r2=615969&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/logger.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/logger.h Mon Jan 28 09:48:41 2008
@@ -24,13 +24,11 @@
#endif
#include <log4cxx/helpers/appenderattachableimpl.h>
-#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/level.h>
#include <log4cxx/helpers/pool.h>
#include <log4cxx/helpers/mutex.h>
#include <log4cxx/spi/location/locationinfo.h>
#include <log4cxx/helpers/resourcebundle.h>
-#include <log4cxx/spi/loggerrepository.h>
#include <log4cxx/helpers/messagebuffer.h>
@@ -40,10 +38,18 @@
namespace helpers {
class synchronized;
}
+
+ namespace spi {
+ class LoggerRepository;
+ LOG4CXX_PTR_DEF(LoggerRepository)
+ class LoggerFactory;
+ LOG4CXX_PTR_DEF(LoggerFactory)
+ }
class Logger;
/** smart pointer to a Logger class */
LOG4CXX_PTR_DEF(Logger)
+ LOG4CXX_LIST_DEF(LoggerList, LoggerPtr)
/**
@@ -51,7 +57,7 @@
operations, except configuration, are done through this class.
*/
class LOG4CXX_EXPORT Logger :
- public virtual spi::AppenderAttachable,
+ public virtual log4cxx::spi::AppenderAttachable,
public virtual helpers::ObjectImpl
{
public:
@@ -92,7 +98,7 @@
// Loggers need to know what Hierarchy they are in
- spi::LoggerRepository * repository;
+ log4cxx::spi::LoggerRepository * repository;
helpers::AppenderAttachableImplPtr aai;
@@ -147,7 +153,7 @@
to log the particular log request.
@param event the event to log. */
- void callAppenders(const spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) const;
+ void callAppenders(const log4cxx::spi::LoggingEventPtr& event, log4cxx::helpers::Pool& p) const;
/**
Close all attached appenders implementing the AppenderAttachable
@@ -310,7 +316,7 @@
Return the the LoggerRepository where this
<code>Logger</code> is attached.
*/
- spi::LoggerRepositoryPtr getLoggerRepository() const;
+ log4cxx::spi::LoggerRepositoryPtr getLoggerRepository() const;
/**
@@ -379,20 +385,20 @@
actually create a new Instance.
*/
static LoggerPtr getLoggerLS(const LogString& name,
- const spi::LoggerFactoryPtr& factory);
+ const log4cxx::spi::LoggerFactoryPtr& factory);
static LoggerPtr getLogger(const std::string& name,
- const spi::LoggerFactoryPtr& factory);
+ const log4cxx::spi::LoggerFactoryPtr& factory);
#if LOG4CXX_WCHAR_T_API
static LoggerPtr getLogger(const std::wstring& name,
- const spi::LoggerFactoryPtr& factory);
+ const log4cxx::spi::LoggerFactoryPtr& factory);
#endif
#if LOG4CXX_UNICHAR_API
static LoggerPtr getLogger(const std::basic_string<UniChar>& name,
- const spi::LoggerFactoryPtr& factory);
+ const log4cxx::spi::LoggerFactoryPtr& factory);
#endif
#if LOG4CXX_CFSTRING_API
static LoggerPtr getLogger(const CFStringRef& name,
- const spi::LoggerFactoryPtr& factory);
+ const log4cxx::spi::LoggerFactoryPtr& factory);
#endif
/**
@@ -910,7 +916,7 @@
@param logger the logger to be used.
@param level the level to log.
@param key the key to be searched in the resourceBundle of the logger.
-@param p1 the unique parameter. Must be of type (TCHAR *).
+@param p1 the unique parameter.
*/
#define LOG4CXX_L7DLOG1(logger, level, key, p1) { \
if (logger->isEnabledFor(level)) {\
@@ -922,8 +928,8 @@
@param logger the logger to be used.
@param level the level to log.
@param key the key to be searched in the resourceBundle of the logger.
-@param p1 the first parameter. Must be of type (TCHAR *).
-@param p2 the second parameter. Must be of type (TCHAR *).
+@param p1 the first parameter.
+@param p2 the second parameter.
*/
#define LOG4CXX_L7DLOG2(logger, level, key, p1, p2) { \
if (logger->isEnabledFor(level)) {\
@@ -935,9 +941,9 @@
@param logger the logger to be used.
@param level the level to log.
@param key the key to be searched in the resourceBundle of the logger.
-@param p1 the first parameter. Must be of type (TCHAR *).
-@param p2 the second parameter. Must be of type (TCHAR *).
-@param p3 the third parameter. Must be of type (TCHAR *).
+@param p1 the first parameter.
+@param p2 the second parameter.
+@param p3 the third parameter.
*/
#define LOG4CXX_L7DLOG3(logger, level, key, p1, p2, p3) { \
if (logger->isEnabledFor(level)) {\
@@ -949,5 +955,6 @@
#pragma warning ( pop )
#endif
+#include <log4cxx/spi/loggerrepository.h>
#endif //_LOG4CXX_LOGGER_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h?rev=615969&r1=615968&r2=615969&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h Mon Jan 28 09:48:41 2008
@@ -380,6 +380,10 @@
void registryPut(const AppenderPtr& appender);
AppenderPtr registryGet(const LogString& name);
+
+private:
+ PropertyConfigurator(const PropertyConfigurator&);
+ PropertyConfigurator& operator=(const PropertyConfigurator&);
}; // class PropertyConfigurator
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h?rev=615969&r1=615968&r2=615969&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h Mon Jan 28 09:48:41 2008
@@ -26,6 +26,7 @@
#include <log4cxx/appender.h>
+#include <log4cxx/logger.h>
namespace log4cxx
{
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerfactory.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerfactory.h?rev=615969&r1=615968&r2=615969&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerfactory.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerfactory.h Mon Jan 28 09:48:41 2008
@@ -18,14 +18,10 @@
#ifndef _LOG4CXX_SPI_LOGGERFACTORY_H
#define _LOG4CXX_SPI_LOGGERFACTORY_H
-#include <log4cxx/helpers/object.h>
-#include <log4cxx/helpers/objectptr.h>
-#include <log4cxx/logstring.h>
+#include <log4cxx/logger.h>
namespace log4cxx
{
- class Logger;
- typedef helpers::ObjectPtrT<Logger> LoggerPtr;
namespace spi
{
@@ -42,8 +38,6 @@
log4cxx::helpers::Pool& pool,
const LogString& name) const = 0;
};
-
- LOG4CXX_PTR_DEF(LoggerFactory)
} // namespace spi
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h?rev=615969&r1=615968&r2=615969&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h Mon Jan 28 09:48:41 2008
@@ -26,14 +26,17 @@
#include <log4cxx/appender.h>
#include <log4cxx/spi/loggerfactory.h>
-#include <log4cxx/spi/hierarchyeventlistener.h>
#include <log4cxx/level.h>
namespace log4cxx
{
- LOG4CXX_LIST_DEF(LoggerList, LoggerPtr)
namespace spi
{
+ class HierarchyEventListener;
+ LOG4CXX_PTR_DEF(HierarchyEventListener)
+ LOG4CXX_LIST_DEF(HierarchyEventListenerList, HierarchyEventListenerPtr)
+
+
/**
A <code>LoggerRepository</code> is used to create and retrieve
<code>Loggers</code>. The relation between loggers in a repository
@@ -104,8 +107,6 @@
virtual void setConfigured(bool configured) = 0;
}; // class LoggerRepository
-
- LOG4CXX_PTR_DEF(LoggerRepository)
} // namespace spi
} // namespace log4cxx