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/02/13 02:23:23 UTC
svn commit: r627213 [1/2] - in /logging/log4cxx/trunk: ./ src/examples/cpp/
src/main/cpp/ src/main/include/log4cxx/ src/main/include/log4cxx/filter/
src/main/include/log4cxx/helpers/ src/main/include/log4cxx/net/
src/main/include/log4cxx/rolling/ src/m...
Author: carnold
Date: Tue Feb 12 17:23:18 2008
New Revision: 627213
URL: http://svn.apache.org/viewvc?rev=627213&view=rev
Log:
LOGCXX-62: Remove stray tabs and bad EOLs
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp
logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
logging/log4cxx/trunk/src/main/cpp/fallbackerrorhandler.cpp
logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp
logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp
logging/log4cxx/trunk/src/main/cpp/logger.cpp
logging/log4cxx/trunk/src/main/cpp/loglog.cpp
logging/log4cxx/trunk/src/main/cpp/logstream.cpp
logging/log4cxx/trunk/src/main/cpp/messagebuffer.cpp
logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp
logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp
logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp
logging/log4cxx/trunk/src/main/cpp/onlyonceerrorhandler.cpp
logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp
logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp
logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp
logging/log4cxx/trunk/src/main/cpp/thread.cpp
logging/log4cxx/trunk/src/main/cpp/writerappender.cpp
logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp
logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetdecoder.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetencoder.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/messagebuffer.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemerrwriter.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemoutwriter.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h
logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h
logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.h
logging/log4cxx/trunk/src/main/include/log4cxx/stream.h
logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h
logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h
logging/log4cxx/trunk/src/test/cpp/abts.cpp
logging/log4cxx/trunk/src/test/cpp/asyncappendertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/helpers/messagebuffertest.cpp
logging/log4cxx/trunk/src/test/cpp/helpers/optionconvertertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/leveltestcase.cpp
logging/log4cxx/trunk/src/test/cpp/logunit.cpp
logging/log4cxx/trunk/src/test/cpp/spi/loggingeventtest.cpp
logging/log4cxx/trunk/src/test/cpp/streamtestcase.cpp
logging/log4cxx/trunk/src/test/cpp/xml/xmllayouttestcase.cpp
Modified: logging/log4cxx/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Tue Feb 12 17:23:18 2008
@@ -23,8 +23,8 @@
<libset libs="${apr.lib.prefix}${apr.lib.name}${apr.lib.suffix}" dir="${apr.lib.dir}" if="apr.lib.dir"/>
<libset libs="${apr.lib.prefix}${apr.lib.name}${apr.lib.suffix}" unless="apr.lib.dir"/>
<libset libs="esmtp" if="has-libesmtp"/>
- <libset libs="${odbc.lib}" if="odbc.lib"/>
- <libset libs="${apr-util.dependencies}" if="apr-util.dependencies"/>
+ <libset libs="${odbc.lib}" if="odbc.lib"/>
+ <libset libs="${apr-util.dependencies}" if="apr-util.dependencies"/>
<libset libs="pthread" if="is-unix"/>
<syslibset libs="advapi32 ws2_32 mswsock shell32" if="is-windows"/>
<syslibset libs="stdc++" if="is-gcc"/>
@@ -170,22 +170,22 @@
<equals arg1="${with-SMTP}" arg2="libesmtp"/>
</condition>
- <condition property="odbc.lib" value="iodbc">
- <equals arg1="${with-ODBC}" arg2="iODBC"/>
- </condition>
-
- <condition property="odbc.lib" value="unixodbc">
- <equals arg1="${with-ODBC}" arg2="unixODBC"/>
- </condition>
-
- <condition property="odbc.lib" value="odbc32">
- <equals arg1="${with-ODBC}" arg2="Microsoft"/>
- </condition>
-
- <condition property="has-ODBC" value="1">
- <isset property="odbc.lib"/>
- </condition>
- <property name="has-ODBC" value="0"/>
+ <condition property="odbc.lib" value="iodbc">
+ <equals arg1="${with-ODBC}" arg2="iODBC"/>
+ </condition>
+
+ <condition property="odbc.lib" value="unixodbc">
+ <equals arg1="${with-ODBC}" arg2="unixODBC"/>
+ </condition>
+
+ <condition property="odbc.lib" value="odbc32">
+ <equals arg1="${with-ODBC}" arg2="Microsoft"/>
+ </condition>
+
+ <condition property="has-ODBC" value="1">
+ <isset property="odbc.lib"/>
+ </condition>
+ <property name="has-ODBC" value="0"/>
<condition property="force-ant" value="1">
<equals arg1="${find}" arg2="false"/>
@@ -214,7 +214,7 @@
file="${include.dir}/log4cxx/log4cxx.hw" overwrite="true"/>
<copy tofile="${include.dir}/log4cxx/private/log4cxx_private.tmp"
file="${include.dir}/log4cxx/private/log4cxx_private.hw" overwrite="true"/>
- <property name="odbc.lib" value="odbc32"/>
+ <property name="odbc.lib" value="odbc32"/>
</target>
@@ -357,9 +357,9 @@
<target name="build-apr" depends="find-apr" unless="apr.lib.file">
<fail unless="apr.src.dir">Could not locate apr library or source.</fail>
<property name="apr.lib.type" value="static"/>
- <property name="apr.lib.prefix" value=""/>
- <property name="apr.lib.suffix" value=""/>
- <property name="project.type" value="msvc6"/>
+ <property name="apr.lib.prefix" value=""/>
+ <property name="apr.lib.suffix" value=""/>
+ <property name="project.type" value="msvc6"/>
<ant antfile="src/ant/apr-build.xml" target="build" inheritAll="false">
<property name="basedir" value="${apr.src.dir}"/>
<property name="target.dir" value="${target.dir}"/>
@@ -385,9 +385,9 @@
<target name="build-apr-util" depends="build-apr, find-apr-util" unless="apr-util.lib.file">
<fail unless="apr-util.src.dir">Could not locate apr-util library or source.</fail>
<property name="apr-util.lib.type" value="${apr.lib.type}"/>
- <property name="apr-util.lib.prefix" value=""/>
- <property name="apr-util.lib.suffix" value=""/>
- <property name="project.type" value="msvc6"/>
+ <property name="apr-util.lib.prefix" value=""/>
+ <property name="apr-util.lib.suffix" value=""/>
+ <property name="project.type" value="msvc6"/>
<ant antfile="src/ant/apr-util-build.xml" target="build" inheritAll="false">
<property name="target.dir" value="${target.dir}"/>
@@ -419,7 +419,7 @@
<property name="libesmtp.lib.type" value="static"/>
<property name="libesmtp.lib.prefix" value=""/>
<property name="libesmtp.lib.suffix" value=""/>
- <property name="project.type" value="msvc6"/>
+ <property name="project.type" value="msvc6"/>
<ant antfile="src/ant/esmtp-build.xml" target="build" inheritAll="false">
<property name="target.dir" value="${target.dir}"/>
@@ -469,7 +469,7 @@
<foreach target="make-header-check" param="header">
<path><fileset dir="${target.dir}/header-check" includes="**/*.h"/></path>
</foreach>
- <property name="project.type" value="msvc6"/>
+ <property name="project.type" value="msvc6"/>
<cc objdir="${target.dir}/header-check"
name="gcc"
exceptions="true"
@@ -494,30 +494,30 @@
<target name="build" depends="build-apr-util, configure" description="Build log4cxx library">
<mkdir dir="${log4cxx.lib.dir}/log4cxx_obj"/>
- <condition property="apr-static" value="1">
- <equals arg1="${apr.lib.type}" arg2="static"/>
- </condition>
-
- <condition property="apr-util-static" value="1">
- <equals arg1="${apr-util.lib.type}" arg2="static"/>
- </condition>
-
- <condition property="apr-libs-match" value="1">
- <equals arg1="${apr.lib.type}" arg2="${apr-util.lib.type}"/>
- </condition>
-
- <fail unless="apr-libs-match">apr is ${apr.lib.type} and apr-util is ${apr-util.lib.type}, must be same type.</fail>
- <property name="lib.name" value="log4cxx"/>
- <property name="lib.prefix" value=""/>
- <property name="lib.suffix" value=""/>
-
- <condition property="apr-util.dependencies" value="expat iconv">
- <equals arg1="${apr-util.lib.type}" arg2="static"/>
- </condition>
+ <condition property="apr-static" value="1">
+ <equals arg1="${apr.lib.type}" arg2="static"/>
+ </condition>
+
+ <condition property="apr-util-static" value="1">
+ <equals arg1="${apr-util.lib.type}" arg2="static"/>
+ </condition>
+
+ <condition property="apr-libs-match" value="1">
+ <equals arg1="${apr.lib.type}" arg2="${apr-util.lib.type}"/>
+ </condition>
+
+ <fail unless="apr-libs-match">apr is ${apr.lib.type} and apr-util is ${apr-util.lib.type}, must be same type.</fail>
+ <property name="lib.name" value="log4cxx"/>
+ <property name="lib.prefix" value=""/>
+ <property name="lib.suffix" value=""/>
+
+ <condition property="apr-util.dependencies" value="expat iconv">
+ <equals arg1="${apr-util.lib.type}" arg2="static"/>
+ </condition>
<property name="project.compiler" value="${compiler}"/>
- <property name="project.type" value="msvc6"/>
+ <property name="project.type" value="msvc6"/>
<cc name="${project.compiler}"
exceptions="true"
@@ -542,7 +542,7 @@
<compilerarg value="${pic-option}" if="pic-option"/>
&libsets;
<project type="${project.type}" outfile="${projects.dir}/${lib.name}" if="project.if">
- <comment>&license;</comment>
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
<dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
</project>
@@ -553,7 +553,7 @@
<target name="build-example">
<mkdir dir="${log4cxx.lib.dir}/${example.name}_obj"/>
<property name="project.compiler" value="${compiler}"/>
- <property name="project.type" value="msvc6"/>
+ <property name="project.type" value="msvc6"/>
<property name="example.include.dir" value="${example.src.dir}"/>
<cc name="${project.compiler}"
exceptions="true"
@@ -579,7 +579,7 @@
&libsets;
<project outfile="${projects.dir}/${example.name}" type="${project.type}" if="project.if">
- <comment>&license;</comment>
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
<dependency name="${projects.dir}/aprutil-1"/>
<dependency file="${projects.dir}/log4cxx" depends="apr-1,aprutil-1"/>
@@ -648,7 +648,7 @@
<mkdir dir="${log4cxx.lib.dir}/testsuite_obj"/>
<property name="project.compiler" value="${compiler}"/>
- <property name="project.type" value="msvc6"/>
+ <property name="project.type" value="msvc6"/>
<cc name="${project.compiler}"
exceptions="true"
outfile="${log4cxx.lib.dir}/testsuite"
@@ -673,7 +673,7 @@
&libsets;
<project outfile="${projects.dir}/testsuite" type="${project.type}" if="project.if">
- <comment>&license;</comment>
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
<dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
<dependency file="${projects.dir}/log4cxx" depends="apr-1,aprutil-1"/>
@@ -689,7 +689,7 @@
depends="build-apr-util,configure">
<mkdir dir="${executable.dir}/static/testsuite-standalone_obj"/>
<property name="project.compiler" value="${compiler}"/>
- <property name="project.type" value="msvc6"/>
+ <property name="project.type" value="msvc6"/>
<cc name="${project.compiler}"
exceptions="true"
outfile="${executable.dir}/static/testsuite-standalone"
@@ -723,7 +723,7 @@
<project outfile="${projects.dir}/testsuite-standalone"
type="${project.type}"
if="project.if">
- <comment>&license;</comment>
+ <comment>&license;</comment>
<dependency file="${projects.dir}/apr-1"/>
<dependency file="${projects.dir}/aprutil-1" depends="apr-1"/>
</project>
@@ -900,7 +900,7 @@
<target name="build-projects">
<mkdir dir="${projects.dir}"/>
- <property name="project.type" value="msvc6"/>
+ <property name="project.type" value="msvc6"/>
<antcall target="build-unittest">
<param name="project.if" value="true"/>
<param name="project.type" value="${project.type}"/>
@@ -1097,26 +1097,26 @@
out="src/changes/changes.xml"/>
</target>
- <target name="checkout-site" unless="svn-available">
- <exec executable="svn">
- <arg value="co"/>
- <arg value="${svnsite.url}"/>
- <arg value="target/site-deploy"/>
- </exec>
- </target>
-
- <target name="update-site" if="svn-available">
- <exec executable="svn" dir="target/site-deploy" failonerror="true">
- <arg value="update"/>
- </exec>
- </target>
+ <target name="checkout-site" unless="svn-available">
+ <exec executable="svn">
+ <arg value="co"/>
+ <arg value="${svnsite.url}"/>
+ <arg value="target/site-deploy"/>
+ </exec>
+ </target>
+
+ <target name="update-site" if="svn-available">
+ <exec executable="svn" dir="target/site-deploy" failonerror="true">
+ <arg value="update"/>
+ </exec>
+ </target>
- <target name="post-site" depends="checkout-site, update-site"/>
-
+ <target name="post-site" depends="checkout-site, update-site"/>
+
<target name="mime=html">
<exec executable="svn">
- <arg value="propset"/>
+ <arg value="propset"/>
<arg value="svn:mime-type"/>
<arg value="text/html"/>
<arg value="${src.html}"/>
@@ -1125,20 +1125,20 @@
<target name="mime=css">
<exec executable="svn">
- <arg value="propset"/>
+ <arg value="propset"/>
<arg value="svn:mime-type"/>
<arg value="text/css"/>
<arg value="${src.css}"/>
</exec>
</target>
-
+
- <target name="site-deploy">
- <!-- Add any new files (and generate innocuous warnings for the existing content) -->
+ <target name="site-deploy">
+ <!-- Add any new files (and generate innocuous warnings for the existing content) -->
<delete file="target/site-deploy/svn-commit.tmp~"/>
- <exec executable="bash" dir="target/site-deploy" failonerror="true">
- <arg line='-c "svn add --force *"'/>
- </exec>
+ <exec executable="bash" dir="target/site-deploy" failonerror="true">
+ <arg line='-c "svn add --force *"'/>
+ </exec>
<taskdef name="foreach" classname="net.sf.antcontrib.logic.ForEach" />
<foreach target="mime=html" param="src.html">
<path>
@@ -1150,11 +1150,11 @@
<fileset dir="target/site-deploy" includes="**/*.css"/>
</path>
</foreach>
- <!-- requires that SVN_EDITOR, VISUAL or EDITOR being set to edit commit description -->
- <exec executable="svn" dir="target/site-deploy" failonerror="true">
- <arg value="commit"/>
- </exec>
- </target>
+ <!-- requires that SVN_EDITOR, VISUAL or EDITOR being set to edit commit description -->
+ <exec executable="svn" dir="target/site-deploy" failonerror="true">
+ <arg value="commit"/>
+ </exec>
+ </target>
Modified: logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp (original)
+++ logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp Tue Feb 12 17:23:18 2008
@@ -67,9 +67,9 @@
configFile.substr(configFile.length() - 4) == ".xml")
{
#if APR_HAS_THREADS
- xml::DOMConfigurator::configureAndWatch(configFile, 3000);
+ xml::DOMConfigurator::configureAndWatch(configFile, 3000);
#else
- xml::DOMConfigurator::configure(configFile);
+ xml::DOMConfigurator::configure(configFile);
#endif
}
else
@@ -87,7 +87,7 @@
int i = 0;
while(true)
{
- LOG4CXX_DEBUG(logger, "MSG " << i++);
+ LOG4CXX_DEBUG(logger, "MSG " << i++);
try
{
apr_sleep(1000000);
Modified: logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/domconfigurator.cpp Tue Feb 12 17:23:18 2008
@@ -108,11 +108,11 @@
}
void DOMConfigurator::addRef() const {
- ObjectImpl::addRef();
+ ObjectImpl::addRef();
}
void DOMConfigurator::releaseRef() const {
- ObjectImpl::releaseRef();
+ ObjectImpl::releaseRef();
}
/**
Modified: logging/log4cxx/trunk/src/main/cpp/fallbackerrorhandler.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/fallbackerrorhandler.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/fallbackerrorhandler.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/fallbackerrorhandler.cpp Tue Feb 12 17:23:18 2008
@@ -36,11 +36,11 @@
}
void FallbackErrorHandler::addRef() const {
- ObjectImpl::addRef();
+ ObjectImpl::addRef();
}
void FallbackErrorHandler::releaseRef() const {
- ObjectImpl::releaseRef();
+ ObjectImpl::releaseRef();
}
void FallbackErrorHandler::setLogger(const LoggerPtr& logger)
Modified: logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/gzcompressaction.cpp Tue Feb 12 17:23:18 2008
@@ -64,8 +64,8 @@
apr_file_t* child_err;
stat = apr_file_open_stderr(&child_err, pool);
if (stat == APR_SUCCESS) {
- stat = apr_procattr_child_err_set(attr, child_err, NULL);
- if (stat != APR_SUCCESS) throw IOException(stat);
+ stat = apr_procattr_child_err_set(attr, child_err, NULL);
+ if (stat != APR_SUCCESS) throw IOException(stat);
}
const char** args = (const char**)
Modified: logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/locationinfo.cpp Tue Feb 12 17:23:18 2008
@@ -149,19 +149,19 @@
os.writeNull(p);
} else {
char prolog[] = {
- 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
- 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
- 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
- 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F,
- 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB,
- 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01,
- 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49,
- 0x6E, 0x66, 0x6F,
+ 0x72, 0x00, 0x21, 0x6F, 0x72, 0x67, 0x2E,
+ 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C,
+ 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69,
+ 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F,
+ 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB,
+ 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01,
+ 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49,
+ 0x6E, 0x66, 0x6F,
0x74, 0x00, 0x12, 0x4C, 0x6A,
0x61, 0x76, 0x61, 0x2F, 0x6C, 0x61, 0x6E, 0x67,
0x2F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B,
- 0x78, 0x70 };
- os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
+ 0x78, 0x70 };
+ os.writeProlog("org.apache.log4j.spi.LocationInfo", 2, prolog, sizeof(prolog), p);
char* line = apr_itoa((apr_pool_t*) p.getAPRPool(), lineNumber);
//
// construct Java-like fullInfo (replace "::" with ".")
Modified: logging/log4cxx/trunk/src/main/cpp/logger.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logger.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logger.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logger.cpp Tue Feb 12 17:23:18 2008
@@ -71,9 +71,9 @@
aai = new AppenderAttachableImpl(*pool);
}
aai->addAppender(newAppender);
- if (repository != 0) {
+ if (repository != 0) {
repository->fireAddAppenderEvent(this, newAppender);
- }
+ }
}
@@ -82,8 +82,8 @@
int writes = 0;
for(LoggerPtr logger(this);
- logger != 0;
- logger = logger->parent)
+ logger != 0;
+ logger = logger->parent)
{
// Protected against simultaneous call to addAppender, removeAppender,...
synchronized sync(logger->mutex);
@@ -228,8 +228,8 @@
}
catch (MissingResourceException&)
{
- logLS(Level::getError(), LOG4CXX_STR("No resource is associated with key \"") +
- key + LOG4CXX_STR("\"."), LocationInfo::getLocationUnavailable());
+ logLS(Level::getError(), LOG4CXX_STR("No resource is associated with key \"") +
+ key + LOG4CXX_STR("\"."), LocationInfo::getLocationUnavailable());
return LogString();
}
Modified: logging/log4cxx/trunk/src/main/cpp/loglog.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loglog.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loglog.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loglog.cpp Tue Feb 12 17:23:18 2008
@@ -104,7 +104,7 @@
void LogLog::emit(const LogString& msg) {
LogString out(LOG4CXX_STR("log4cxx: "));
out.append(msg);
- out.append(1, (logchar) 0x0A);
+ out.append(1, (logchar) 0x0A);
SystemErrWriter::write(out);
}
@@ -116,6 +116,6 @@
} else {
out.append(LOG4CXX_STR("std::exception::what() == null"));
}
- out.append(1, (logchar) 0x0A);
+ out.append(1, (logchar) 0x0A);
SystemErrWriter::write(out);
}
Modified: logging/log4cxx/trunk/src/main/cpp/logstream.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logstream.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logstream.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logstream.cpp Tue Feb 12 17:23:18 2008
@@ -28,10 +28,10 @@
logstream_base::logstream_ios_base::logstream_ios_base(std::ios_base::fmtflags initval,
int initsize) {
#if LOG4CXX_MEMSET_IOS_BASE
- //
- // the destructor for std::ios_base in the MSVC STL
- // releases a pointer that was not initialized in the constructor.
- //
+ //
+ // the destructor for std::ios_base in the MSVC STL
+ // releases a pointer that was not initialized in the constructor.
+ //
memset(this, 0, sizeof(*this));
#endif
flags(initval);
@@ -183,7 +183,7 @@
logstream::logstream(const Ch* loggerName,
const log4cxx::LevelPtr& level)
- : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
+ : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
@@ -268,12 +268,12 @@
}
void logstream::refresh_stream_state() {
- if (stream != 0) {
- int fillchar;
- if(logstream_base::set_stream_state(*stream, fillchar)) {
- stream->fill(fillchar);
- }
- }
+ if (stream != 0) {
+ int fillchar;
+ if(logstream_base::set_stream_state(*stream, fillchar)) {
+ stream->fill(fillchar);
+ }
+ }
}
@@ -285,7 +285,7 @@
wlogstream::wlogstream(const Ch* loggerName,
const log4cxx::LevelPtr& level)
- : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
+ : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
@@ -373,19 +373,19 @@
}
void wlogstream::refresh_stream_state() {
- if (stream != 0) {
- int fillchar;
- if(logstream_base::set_stream_state(*stream, fillchar)) {
- stream->fill(fillchar);
- }
- }
+ if (stream != 0) {
+ int fillchar;
+ if(logstream_base::set_stream_state(*stream, fillchar)) {
+ stream->fill(fillchar);
+ }
+ }
}
#endif
#if LOG4CXX_UNICHAR_API
ulogstream::ulogstream(const Ch* loggerName,
const log4cxx::LevelPtr& level)
- : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
+ : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
@@ -397,7 +397,7 @@
#if LOG4CXX_CFSTRING_API
ulogstream::ulogstream(const CFStringRef& loggerName,
const log4cxx::LevelPtr& level)
- : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
+ : logstream_base(log4cxx::Logger::getLogger(loggerName), level), stream(0) {
}
#endif
@@ -492,12 +492,12 @@
}
void ulogstream::refresh_stream_state() {
- if (stream != 0) {
- int fillchar;
- if(logstream_base::set_stream_state(*stream, fillchar)) {
- stream->fill(fillchar);
- }
- }
+ if (stream != 0) {
+ int fillchar;
+ if(logstream_base::set_stream_state(*stream, fillchar)) {
+ stream->fill(fillchar);
+ }
+ }
}
#endif
Modified: logging/log4cxx/trunk/src/main/cpp/messagebuffer.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/messagebuffer.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/messagebuffer.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/messagebuffer.cpp Tue Feb 12 17:23:18 2008
@@ -23,61 +23,61 @@
CharMessageBuffer::CharMessageBuffer() : stream(0) {}
CharMessageBuffer::~CharMessageBuffer() {
- delete stream;
+ delete stream;
}
CharMessageBuffer& CharMessageBuffer::operator<<(const std::basic_string<char>& msg) {
- if (stream == 0) {
- buf.append(msg);
- } else {
- *stream << msg;
- }
- return *this;
+ if (stream == 0) {
+ buf.append(msg);
+ } else {
+ *stream << msg;
+ }
+ return *this;
}
CharMessageBuffer& CharMessageBuffer::operator<<(const char* msg) {
- const char* actualMsg = msg;
- if (actualMsg == 0) {
- actualMsg = "null";
- }
- if (stream == 0) {
- buf.append(actualMsg);
- } else {
- *stream << actualMsg;
- }
- return *this;
+ const char* actualMsg = msg;
+ if (actualMsg == 0) {
+ actualMsg = "null";
+ }
+ if (stream == 0) {
+ buf.append(actualMsg);
+ } else {
+ *stream << actualMsg;
+ }
+ return *this;
}
CharMessageBuffer& CharMessageBuffer::operator<<(char* msg) {
- return operator<<((const char*) msg);
+ return operator<<((const char*) msg);
}
CharMessageBuffer& CharMessageBuffer::operator<<(const char msg) {
- if (stream == 0) {
- buf.append(1, msg);
- } else {
- buf.assign(1, msg);
- *stream << buf;
- }
- return *this;
+ if (stream == 0) {
+ buf.append(1, msg);
+ } else {
+ buf.assign(1, msg);
+ *stream << buf;
+ }
+ return *this;
}
CharMessageBuffer::operator std::basic_ostream<char>&() {
- if (stream == 0) {
- stream = new std::basic_ostringstream<char>();
- if (!buf.empty()) {
- *stream << buf;
- }
- }
- return *stream;
+ if (stream == 0) {
+ stream = new std::basic_ostringstream<char>();
+ if (!buf.empty()) {
+ *stream << buf;
+ }
+ }
+ return *stream;
}
const std::basic_string<char>& CharMessageBuffer::str(std::basic_ostream<char>&) {
- buf = stream->str();
- return buf;
+ buf = stream->str();
+ return buf;
}
const std::basic_string<char>& CharMessageBuffer::str(CharMessageBuffer&) {
- return buf;
+ return buf;
}
bool CharMessageBuffer::hasStream() const {
@@ -85,9 +85,9 @@
}
std::ostream& CharMessageBuffer::operator<<(ios_base_manip manip) {
- std::ostream& s = *this;
- (*manip)(s);
- return s;
+ std::ostream& s = *this;
+ (*manip)(s);
+ return s;
}
std::ostream& CharMessageBuffer::operator<<(bool val) { return ((std::ostream&) *this).operator<<(val); }
@@ -106,62 +106,62 @@
WideMessageBuffer::WideMessageBuffer() : stream(0) {}
WideMessageBuffer::~WideMessageBuffer() {
- delete stream;
+ delete stream;
}
WideMessageBuffer& WideMessageBuffer::operator<<(const std::basic_string<wchar_t>& msg) {
- if (stream == 0) {
- buf.append(msg);
- } else {
- *stream << msg;
- }
- return *this;
+ if (stream == 0) {
+ buf.append(msg);
+ } else {
+ *stream << msg;
+ }
+ return *this;
}
WideMessageBuffer& WideMessageBuffer::operator<<(const wchar_t* msg) {
- const wchar_t* actualMsg = msg;
- if (actualMsg == 0) {
- actualMsg = L"null";
- }
- if (stream == 0) {
- buf.append(actualMsg);
- } else {
- *stream << actualMsg;
- }
- return *this;
+ const wchar_t* actualMsg = msg;
+ if (actualMsg == 0) {
+ actualMsg = L"null";
+ }
+ if (stream == 0) {
+ buf.append(actualMsg);
+ } else {
+ *stream << actualMsg;
+ }
+ return *this;
}
WideMessageBuffer& WideMessageBuffer::operator<<(wchar_t* msg) {
- return operator<<((const wchar_t*) msg);
+ return operator<<((const wchar_t*) msg);
}
WideMessageBuffer& WideMessageBuffer::operator<<(const wchar_t msg) {
- if (stream == 0) {
- buf.append(1, msg);
- } else {
- buf.assign(1, msg);
- *stream << buf;
- }
- return *this;
+ if (stream == 0) {
+ buf.append(1, msg);
+ } else {
+ buf.assign(1, msg);
+ *stream << buf;
+ }
+ return *this;
}
WideMessageBuffer::operator std::basic_ostream<wchar_t>&() {
- if (stream == 0) {
- stream = new std::basic_ostringstream<wchar_t>();
- if (!buf.empty()) {
- *stream << buf;
- }
- }
- return *stream;
+ if (stream == 0) {
+ stream = new std::basic_ostringstream<wchar_t>();
+ if (!buf.empty()) {
+ *stream << buf;
+ }
+ }
+ return *stream;
}
const std::basic_string<wchar_t>& WideMessageBuffer::str(std::basic_ostream<wchar_t>&) {
- buf = stream->str();
- return buf;
+ buf = stream->str();
+ return buf;
}
const std::basic_string<wchar_t>& WideMessageBuffer::str(WideMessageBuffer&) {
- return buf;
+ return buf;
}
bool WideMessageBuffer::hasStream() const {
@@ -169,9 +169,9 @@
}
std::basic_ostream<wchar_t>& WideMessageBuffer::operator<<(ios_base_manip manip) {
- std::basic_ostream<wchar_t>& s = *this;
- (*manip)(s);
- return s;
+ std::basic_ostream<wchar_t>& s = *this;
+ (*manip)(s);
+ return s;
}
std::basic_ostream<wchar_t>& WideMessageBuffer::operator<<(bool val) { return ((std::basic_ostream<wchar_t>&) *this).operator<<(val); }
@@ -209,63 +209,63 @@
}
std::ostream& MessageBuffer::operator<<(ios_base_manip manip) {
- std::ostream& s = *this;
- (*manip)(s);
- return s;
+ std::ostream& s = *this;
+ (*manip)(s);
+ return s;
}
MessageBuffer::operator std::ostream&() {
- return (std::ostream&) cbuf;
+ return (std::ostream&) cbuf;
}
CharMessageBuffer& MessageBuffer::operator<<(const std::string& msg) {
- return cbuf.operator<<(msg);
+ return cbuf.operator<<(msg);
}
CharMessageBuffer& MessageBuffer::operator<<(const char* msg) {
- return cbuf.operator<<(msg);
+ return cbuf.operator<<(msg);
}
CharMessageBuffer& MessageBuffer::operator<<(char* msg) {
- return cbuf.operator<<((const char*) msg);
+ return cbuf.operator<<((const char*) msg);
}
CharMessageBuffer& MessageBuffer::operator<<(const char msg) {
- return cbuf.operator<<(msg);
+ return cbuf.operator<<(msg);
}
const std::string& MessageBuffer::str(CharMessageBuffer& buf) {
- return cbuf.str(buf);
+ return cbuf.str(buf);
}
const std::string& MessageBuffer::str(std::ostream& os) {
- return cbuf.str(os);
+ return cbuf.str(os);
}
WideMessageBuffer& MessageBuffer::operator<<(const std::wstring& msg) {
- wbuf = new WideMessageBuffer();
- return (*wbuf) << msg;
+ wbuf = new WideMessageBuffer();
+ return (*wbuf) << msg;
}
WideMessageBuffer& MessageBuffer::operator<<(const wchar_t* msg) {
- wbuf = new WideMessageBuffer();
- return (*wbuf) << msg;
+ wbuf = new WideMessageBuffer();
+ return (*wbuf) << msg;
}
WideMessageBuffer& MessageBuffer::operator<<(wchar_t* msg) {
- wbuf = new WideMessageBuffer();
- return (*wbuf) << (const wchar_t*) msg;
+ wbuf = new WideMessageBuffer();
+ return (*wbuf) << (const wchar_t*) msg;
}
WideMessageBuffer& MessageBuffer::operator<<(const wchar_t msg) {
- wbuf = new WideMessageBuffer();
- return (*wbuf) << msg;
+ wbuf = new WideMessageBuffer();
+ return (*wbuf) << msg;
}
const std::wstring& MessageBuffer::str(WideMessageBuffer& buf) {
- return wbuf->str(buf);
+ return wbuf->str(buf);
}
const std::wstring& MessageBuffer::str(std::basic_ostream<wchar_t>& os) {
- return wbuf->str(os);
+ return wbuf->str(os);
}
std::ostream& MessageBuffer::operator<<(bool val) { return cbuf.operator<<(val); }
@@ -285,93 +285,93 @@
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
UniCharMessageBuffer& MessageBuffer::operator<<(const std::basic_string<log4cxx::UniChar>& msg) {
- ubuf = new UniCharMessageBuffer();
- return (*ubuf) << msg;
+ ubuf = new UniCharMessageBuffer();
+ return (*ubuf) << msg;
}
UniCharMessageBuffer& MessageBuffer::operator<<(const log4cxx::UniChar* msg) {
- ubuf = new UniCharMessageBuffer();
- return (*ubuf) << msg;
+ ubuf = new UniCharMessageBuffer();
+ return (*ubuf) << msg;
}
UniCharMessageBuffer& MessageBuffer::operator<<(log4cxx::UniChar* msg) {
- ubuf = new UniCharMessageBuffer();
- return (*ubuf) << (const log4cxx::UniChar*) msg;
+ ubuf = new UniCharMessageBuffer();
+ return (*ubuf) << (const log4cxx::UniChar*) msg;
}
UniCharMessageBuffer& MessageBuffer::operator<<(const log4cxx::UniChar msg) {
- ubuf = new UniCharMessageBuffer();
- return (*ubuf) << msg;
+ ubuf = new UniCharMessageBuffer();
+ return (*ubuf) << msg;
}
const std::basic_string<log4cxx::UniChar>& MessageBuffer::str(UniCharMessageBuffer& buf) {
- return ubuf->str(buf);
+ return ubuf->str(buf);
}
const std::basic_string<log4cxx::UniChar>& MessageBuffer::str(std::basic_ostream<log4cxx::UniChar>& os) {
- return ubuf->str(os);
+ return ubuf->str(os);
}
UniCharMessageBuffer::UniCharMessageBuffer() : stream(0) {}
UniCharMessageBuffer::~UniCharMessageBuffer() {
- delete stream;
+ delete stream;
}
UniCharMessageBuffer& UniCharMessageBuffer::operator<<(const std::basic_string<log4cxx::UniChar>& msg) {
- if (stream == 0) {
+ if (stream == 0) {
buf.append(msg);
- } else {
- *stream << buf;
- }
- return *this;
+ } else {
+ *stream << buf;
+ }
+ return *this;
}
UniCharMessageBuffer& UniCharMessageBuffer::operator<<(const log4cxx::UniChar* msg) {
- const log4cxx::UniChar* actualMsg = msg;
+ const log4cxx::UniChar* actualMsg = msg;
static log4cxx::UniChar nullLiteral[] = { 0x6E, 0x75, 0x6C, 0x6C, 0};
- if (actualMsg == 0) {
- actualMsg = nullLiteral;
- }
- if (stream == 0) {
+ if (actualMsg == 0) {
+ actualMsg = nullLiteral;
+ }
+ if (stream == 0) {
buf.append(actualMsg);
- } else {
- *stream << actualMsg;
- }
- return *this;
+ } else {
+ *stream << actualMsg;
+ }
+ return *this;
}
UniCharMessageBuffer& UniCharMessageBuffer::operator<<(log4cxx::UniChar* msg) {
- return operator<<((const log4cxx::UniChar*) msg);
+ return operator<<((const log4cxx::UniChar*) msg);
}
UniCharMessageBuffer& UniCharMessageBuffer::operator<<(const log4cxx::UniChar msg) {
- if (stream == 0) {
+ if (stream == 0) {
buf.append(1, msg);
- } else {
- *stream << msg;
- }
- return *this;
+ } else {
+ *stream << msg;
+ }
+ return *this;
}
UniCharMessageBuffer::operator UniCharMessageBuffer::uostream&() {
- if (stream == 0) {
- stream = new std::basic_ostringstream<UniChar>();
- if (!buf.empty()) {
- *stream << buf;
- }
- }
- return *stream;
+ if (stream == 0) {
+ stream = new std::basic_ostringstream<UniChar>();
+ if (!buf.empty()) {
+ *stream << buf;
+ }
+ }
+ return *stream;
}
const std::basic_string<log4cxx::UniChar>& UniCharMessageBuffer::str(UniCharMessageBuffer::uostream&) {
buf = stream->str();
- return buf;
+ return buf;
}
const std::basic_string<log4cxx::UniChar>& UniCharMessageBuffer::str(UniCharMessageBuffer&) {
- return buf;
+ return buf;
}
bool UniCharMessageBuffer::hasStream() const {
@@ -379,9 +379,9 @@
}
UniCharMessageBuffer::uostream& UniCharMessageBuffer::operator<<(ios_base_manip manip) {
- UniCharMessageBuffer::uostream& s = *this;
- (*manip)(s);
- return s;
+ UniCharMessageBuffer::uostream& s = *this;
+ (*manip)(s);
+ return s;
}
UniCharMessageBuffer::uostream& UniCharMessageBuffer::operator<<(bool val) { return ((UniCharMessageBuffer::uostream&) *this).operator<<(val); }
@@ -418,13 +418,13 @@
buf.append(&tmp[0], tmp.size());
}
}
- return *this;
+ return *this;
}
UniCharMessageBuffer& MessageBuffer::operator<<(const CFStringRef& msg) {
- ubuf = new UniCharMessageBuffer();
- return (*ubuf) << msg;
+ ubuf = new UniCharMessageBuffer();
+ return (*ubuf) << msg;
}
#endif
Modified: logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp Tue Feb 12 17:23:18 2008
@@ -201,9 +201,9 @@
#if LOG4CXX_WCHAR_T_API
LOG4CXX_ENCODE_WCHAR(s, oss);
wchar_t* msgs = (wchar_t*)
- apr_palloc((apr_pool_t*) p.getAPRPool(), (s.length() + 1) * sizeof(wchar_t));
- memcpy(msgs, s.data(), s.length() * sizeof(wchar_t));
- msgs[s.length()] = 0;
+ apr_palloc((apr_pool_t*) p.getAPRPool(), (s.length() + 1) * sizeof(wchar_t));
+ memcpy(msgs, s.data(), s.length() * sizeof(wchar_t));
+ msgs[s.length()] = 0;
BOOL bSuccess = ::ReportEventW(
hEventLog,
getEventType(event),
Modified: logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp Tue Feb 12 17:23:18 2008
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#if defined(_MSC_VER)
-#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
-#endif
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectoutputstream.h>
Modified: logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp Tue Feb 12 17:23:18 2008
@@ -120,7 +120,7 @@
ret = SQLAllocHandle( SQL_HANDLE_STMT, con, &stmt);
if (ret < 0)
{
- LOG4CXX_DECODE_CHAR(msg, GetErrorMessage( SQL_HANDLE_DBC, con, "Failed to allocate sql handle."));
+ LOG4CXX_DECODE_CHAR(msg, GetErrorMessage( SQL_HANDLE_DBC, con, "Failed to allocate sql handle."));
throw SQLException( msg );
}
@@ -129,7 +129,7 @@
if (ret < 0)
{
- LOG4CXX_DECODE_CHAR(msg, GetErrorMessage( SQL_HANDLE_STMT, stmt, "Failed to execute sql statement."));
+ LOG4CXX_DECODE_CHAR(msg, GetErrorMessage( SQL_HANDLE_STMT, stmt, "Failed to execute sql statement."));
throw SQLException( msg );
}
}
Modified: logging/log4cxx/trunk/src/main/cpp/onlyonceerrorhandler.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/onlyonceerrorhandler.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/onlyonceerrorhandler.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/onlyonceerrorhandler.cpp Tue Feb 12 17:23:18 2008
@@ -33,11 +33,11 @@
}
void OnlyOnceErrorHandler::addRef() const {
- ObjectImpl::addRef();
+ ObjectImpl::addRef();
}
void OnlyOnceErrorHandler::releaseRef() const {
- ObjectImpl::releaseRef();
+ ObjectImpl::releaseRef();
}
void OnlyOnceErrorHandler::setLogger(const LoggerPtr&)
Modified: logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/propertyconfigurator.cpp Tue Feb 12 17:23:18 2008
@@ -83,11 +83,11 @@
}
void PropertyConfigurator::addRef() const {
- ObjectImpl::addRef();
+ ObjectImpl::addRef();
}
void PropertyConfigurator::releaseRef() const {
- ObjectImpl::releaseRef();
+ ObjectImpl::releaseRef();
}
void PropertyConfigurator::doConfigure(const File& configFileName,
Modified: logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp Tue Feb 12 17:23:18 2008
@@ -47,7 +47,7 @@
*/
void RollingFileAppender::activateOptions(Pool &p) {
if (rollingPolicy == NULL) {
- FixedWindowRollingPolicy* fwrp = new FixedWindowRollingPolicy();
+ FixedWindowRollingPolicy* fwrp = new FixedWindowRollingPolicy();
fwrp->setFileNamePattern(getFile() + LOG4CXX_STR(".%i"));
rollingPolicy = fwrp;
}
Modified: logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/smtpappender.cpp Tue Feb 12 17:23:18 2008
@@ -478,17 +478,17 @@
}
if(evaluator == 0) {
LogLog::error(LOG4CXX_STR("No TriggeringEventEvaluator is set for appender [")+
- name+LOG4CXX_STR("]."));
+ name+LOG4CXX_STR("]."));
activate = false;
}
if(smtpHost.empty()) {
LogLog::error(LOG4CXX_STR("No smtpHost is set for appender [")+
- name+LOG4CXX_STR("]."));
+ name+LOG4CXX_STR("]."));
activate = false;
}
if(to.empty() && cc.empty() && bcc.empty()) {
LogLog::error(LOG4CXX_STR("No recipient address is set for appender [")+
- name+LOG4CXX_STR("]."));
+ name+LOG4CXX_STR("]."));
activate = false;
}
activate &= asciiCheck(to, LOG4CXX_STR("to"));
Modified: logging/log4cxx/trunk/src/main/cpp/thread.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/thread.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/thread.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/thread.cpp Tue Feb 12 17:23:18 2008
@@ -99,8 +99,8 @@
tls.set(package->getThread());
LaunchStatus alive(&package->getThread()->alive);
void* retval = (package->getRunnable())(thread, package->getData());
- apr_thread_exit((apr_thread_t*) thread, 0);
- return retval;
+ apr_thread_exit((apr_thread_t*) thread, 0);
+ return retval;
}
#endif
Modified: logging/log4cxx/trunk/src/main/cpp/writerappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/writerappender.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/writerappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/writerappender.cpp Tue Feb 12 17:23:18 2008
@@ -208,12 +208,12 @@
layout->format(msg, event, p);
{
synchronized sync(mutex);
- if (writer != NULL) {
- writer->write(msg, p);
+ if (writer != NULL) {
+ writer->write(msg, p);
if (immediateFlush) {
- writer->flush(p);
+ writer->flush(p);
}
- }
+ }
}
}
Modified: logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp Tue Feb 12 17:23:18 2008
@@ -120,7 +120,7 @@
output.append(LOG4CXX_EOL);
}
}
- for (LoggingEvent::KeySet::const_iterator i2 = propertySet.begin();
+ for (LoggingEvent::KeySet::const_iterator i2 = propertySet.begin();
i2 != propertySet.end();
i2++) {
LogString key(*i2);
Modified: logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/zipcompressaction.cpp Tue Feb 12 17:23:18 2008
@@ -52,15 +52,15 @@
apr_file_t* child_err;
stat = apr_file_open_stderr(&child_err, pool);
if (stat == APR_SUCCESS) {
- stat = apr_procattr_child_err_set(attr, child_err, NULL);
- if (stat != APR_SUCCESS) throw IOException(stat);
+ stat = apr_procattr_child_err_set(attr, child_err, NULL);
+ if (stat != APR_SUCCESS) throw IOException(stat);
}
const char** args = (const char**)
apr_palloc(pool, 5 *sizeof(*args));
int i = 0;
args[i++] = "zip";
- args[i++] = "-q";
+ args[i++] = "-q";
args[i++] = apr_pstrdup(pool, destination.getOSName().c_str());
args[i++] = apr_pstrdup(pool, source.getOSName().c_str());
args[i++] = NULL;
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h Tue Feb 12 17:23:18 2008
@@ -85,7 +85,7 @@
*/
FilterDecision decide(const spi::LoggingEventPtr& event) const;
}; // class LevelMatchFilter
- LOG4CXX_PTR_DEF(LevelMatchFilter);
+ LOG4CXX_PTR_DEF(LevelMatchFilter);
} // namespace filter
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h Tue Feb 12 17:23:18 2008
@@ -130,7 +130,7 @@
*/
FilterDecision decide(const spi::LoggingEventPtr& event) const;
}; // class LevelRangeFilter
- LOG4CXX_PTR_DEF(LevelRangeFilter);
+ LOG4CXX_PTR_DEF(LevelRangeFilter);
} // namespace filter
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h Tue Feb 12 17:23:18 2008
@@ -85,7 +85,7 @@
*/
FilterDecision decide(const spi::LoggingEventPtr& event) const;
}; // class StringMatchFilter
- LOG4CXX_PTR_DEF(StringMatchFilter);
+ LOG4CXX_PTR_DEF(StringMatchFilter);
} // namespace filter
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h Tue Feb 12 17:23:18 2008
@@ -16,13 +16,13 @@
*/
#ifndef _LOG4CXX_HELPERS_BYTEARRAYOUTPUTSTREAM_H
-#define _LOG4CXX_HELPERS_BYTEARRAYOUTPUTSTREAM_H
-
-#if defined(_MSC_VER)
-#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
-#endif
-
+#define _LOG4CXX_HELPERS_BYTEARRAYOUTPUTSTREAM_H
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/helpers/outputstream.h>
@@ -68,10 +68,10 @@
} // namespace helpers
} //namespace log4cxx
-
-#if defined(_MSC_VER)
-#pragma warning ( pop )
-#endif
-
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif //_LOG4CXX_HELPERS_BYTEARRAYOUTPUTSTREAM_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetdecoder.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetdecoder.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetdecoder.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetdecoder.h Tue Feb 12 17:23:18 2008
@@ -105,7 +105,7 @@
* Creates a new decoder for the default charset.
*/
static CharsetDecoder* createDefaultDecoder();
- };
+ };
} // namespace helpers
} //namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetencoder.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetencoder.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetencoder.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/charsetencoder.h Tue Feb 12 17:23:18 2008
@@ -126,7 +126,7 @@
CharsetEncoder& operator=(const CharsetEncoder&);
static CharsetEncoder* createDefaultEncoder();
- };
+ };
} // namespace helpers
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h Tue Feb 12 17:23:18 2008
@@ -128,7 +128,7 @@
DatagramPacket& operator=(const DatagramPacket&);
}; // class DatagramPacket
- LOG4CXX_PTR_DEF(DatagramPacket);
+ LOG4CXX_PTR_DEF(DatagramPacket);
} // namespace helpers
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h Tue Feb 12 17:23:18 2008
@@ -121,7 +121,7 @@
int localPort;
};
- LOG4CXX_PTR_DEF(DatagramSocket);
+ LOG4CXX_PTR_DEF(DatagramSocket);
} // namespace helpers
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/messagebuffer.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/messagebuffer.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/messagebuffer.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/messagebuffer.h Tue Feb 12 17:23:18 2008
@@ -39,7 +39,7 @@
/**
* Creates a new instance.
*/
- CharMessageBuffer();
+ CharMessageBuffer();
/**
* Destructor.
*/
@@ -140,24 +140,24 @@
*/
std::ostream& operator<<(void* val);
- /**
- * Cast to ostream.
- */
- operator std::basic_ostream<char>&();
-
- /**
- * Get content of buffer.
- * @param os used only to signal that
- * the embedded stream was used.
- */
- const std::basic_string<char>& str(std::basic_ostream<char>& os);
-
- /**
- * Get content of buffer.
- * @param buf used only to signal that
- * the embedded stream was not used.
- */
- const std::basic_string<char>& str(CharMessageBuffer& buf);
+ /**
+ * Cast to ostream.
+ */
+ operator std::basic_ostream<char>&();
+
+ /**
+ * Get content of buffer.
+ * @param os used only to signal that
+ * the embedded stream was used.
+ */
+ const std::basic_string<char>& str(std::basic_ostream<char>& os);
+
+ /**
+ * Get content of buffer.
+ * @param buf used only to signal that
+ * the embedded stream was not used.
+ */
+ const std::basic_string<char>& str(CharMessageBuffer& buf);
/**
* Returns true if buffer has an encapsulated STL stream.
@@ -169,13 +169,13 @@
/**
* Prevent use of default copy constructor.
*/
- CharMessageBuffer(const CharMessageBuffer&);
+ CharMessageBuffer(const CharMessageBuffer&);
/**
* Prevent use of default assignment operator.
*/
- CharMessageBuffer& operator=(const CharMessageBuffer&);
+ CharMessageBuffer& operator=(const CharMessageBuffer&);
- /**
+ /**
* Encapsulated std::string.
*/
std::basic_string<char> buf;
@@ -187,21 +187,21 @@
template<class V>
std::basic_ostream<char>& operator<<(CharMessageBuffer& os, const V& val) {
- return ((std::basic_ostream<char>&) os) << val;
+ return ((std::basic_ostream<char>&) os) << val;
}
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API || LOG4CXX_LOGCHAR_IS_UNICHAR
/**
* This class is designed to support insertion operations
- * in the message argument to the LOG4CXX_INFO and similar
- * macros and is not designed for general purpose use.
- */
+ * in the message argument to the LOG4CXX_INFO and similar
+ * macros and is not designed for general purpose use.
+ */
class LOG4CXX_EXPORT UniCharMessageBuffer {
public:
/**
* Creates a new instance.
*/
- UniCharMessageBuffer();
+ UniCharMessageBuffer();
/**
* Destructor.
*/
@@ -237,7 +237,7 @@
UniCharMessageBuffer& operator<<(const UniChar msg);
#if LOG4CXX_CFSTRING_API
- /**
+ /**
* Appends a string into the buffer and
* fixes the buffer to use char characters.
* @param msg message to append.
@@ -316,23 +316,23 @@
/**
- * Cast to ostream.
- */
- operator uostream&();
-
- /**
- * Get content of buffer.
- * @param os used only to signal that
- * the embedded stream was used.
- */
- const std::basic_string<UniChar>& str(uostream& os);
-
- /**
- * Get content of buffer.
- * @param buf used only to signal that
- * the embedded stream was not used.
- */
- const std::basic_string<UniChar>& str(UniCharMessageBuffer& buf);
+ * Cast to ostream.
+ */
+ operator uostream&();
+
+ /**
+ * Get content of buffer.
+ * @param os used only to signal that
+ * the embedded stream was used.
+ */
+ const std::basic_string<UniChar>& str(uostream& os);
+
+ /**
+ * Get content of buffer.
+ * @param buf used only to signal that
+ * the embedded stream was not used.
+ */
+ const std::basic_string<UniChar>& str(UniCharMessageBuffer& buf);
/**
* Returns true if buffer has an encapsulated STL stream.
@@ -344,13 +344,13 @@
/**
* Prevent use of default copy constructor.
*/
- UniCharMessageBuffer(const UniCharMessageBuffer&);
+ UniCharMessageBuffer(const UniCharMessageBuffer&);
/**
* Prevent use of default assignment operator.
*/
- UniCharMessageBuffer& operator=(const UniCharMessageBuffer&);
+ UniCharMessageBuffer& operator=(const UniCharMessageBuffer&);
- /**
+ /**
* Encapsulated std::string.
*/
std::basic_string<UniChar> buf;
@@ -362,22 +362,22 @@
template<class V>
UniCharMessageBuffer::uostream& operator<<(UniCharMessageBuffer& os, const V& val) {
- return ((UniCharMessageBuffer::uostream&) os) << val;
+ return ((UniCharMessageBuffer::uostream&) os) << val;
}
#endif
#if LOG4CXX_WCHAR_T_API
/**
* This class is designed to support insertion operations
- * in the message argument to the LOG4CXX_INFO and similar
- * macros and is not designed for general purpose use.
- */
+ * in the message argument to the LOG4CXX_INFO and similar
+ * macros and is not designed for general purpose use.
+ */
class LOG4CXX_EXPORT WideMessageBuffer {
public:
/**
* Creates a new instance.
*/
- WideMessageBuffer();
+ WideMessageBuffer();
/**
* Destructor.
*/
@@ -480,23 +480,23 @@
/**
- * Cast to ostream.
- */
- operator std::basic_ostream<wchar_t>&();
-
- /**
- * Get content of buffer.
- * @param os used only to signal that
- * the embedded stream was used.
- */
- const std::basic_string<wchar_t>& str(std::basic_ostream<wchar_t>& os);
-
- /**
- * Get content of buffer.
- * @param buf used only to signal that
- * the embedded stream was not used.
- */
- const std::basic_string<wchar_t>& str(WideMessageBuffer& buf);
+ * Cast to ostream.
+ */
+ operator std::basic_ostream<wchar_t>&();
+
+ /**
+ * Get content of buffer.
+ * @param os used only to signal that
+ * the embedded stream was used.
+ */
+ const std::basic_string<wchar_t>& str(std::basic_ostream<wchar_t>& os);
+
+ /**
+ * Get content of buffer.
+ * @param buf used only to signal that
+ * the embedded stream was not used.
+ */
+ const std::basic_string<wchar_t>& str(WideMessageBuffer& buf);
/**
* Returns true if buffer has an encapsulated STL stream.
@@ -508,13 +508,13 @@
/**
* Prevent use of default copy constructor.
*/
- WideMessageBuffer(const WideMessageBuffer&);
+ WideMessageBuffer(const WideMessageBuffer&);
/**
* Prevent use of default assignment operator.
*/
- WideMessageBuffer& operator=(const WideMessageBuffer&);
+ WideMessageBuffer& operator=(const WideMessageBuffer&);
- /**
+ /**
* Encapsulated std::string.
*/
std::basic_string<wchar_t> buf;
@@ -526,7 +526,7 @@
template<class V>
std::basic_ostream<wchar_t>& operator<<(WideMessageBuffer& os, const V& val) {
- return ((std::basic_ostream<wchar_t>&) os) << val;
+ return ((std::basic_ostream<wchar_t>&) os) << val;
}
/**
@@ -539,18 +539,18 @@
/**
* Creates a new instance.
*/
- MessageBuffer();
- /**
+ MessageBuffer();
+ /**
* Destructor.
*/
- ~MessageBuffer();
+ ~MessageBuffer();
- /**
- * Cast to ostream.
- */
- operator std::ostream&();
+ /**
+ * Cast to ostream.
+ */
+ operator std::ostream&();
- /**
+ /**
* Appends a string into the buffer and
* fixes the buffer to use char characters.
* @param msg message to append.
@@ -580,23 +580,23 @@
*/
CharMessageBuffer& operator<<(const char msg);
- /**
- * Get content of buffer.
- * @param buf used only to signal
- * the character type and that
- * the embedded stream was not used.
- */
- const std::string& str(CharMessageBuffer& buf);
-
- /**
- * Get content of buffer.
- * @param os used only to signal
- * the character type and that
- * the embedded stream was used.
- */
- const std::string& str(std::ostream& os);
+ /**
+ * Get content of buffer.
+ * @param buf used only to signal
+ * the character type and that
+ * the embedded stream was not used.
+ */
+ const std::string& str(CharMessageBuffer& buf);
+
+ /**
+ * Get content of buffer.
+ * @param os used only to signal
+ * the character type and that
+ * the embedded stream was used.
+ */
+ const std::string& str(std::ostream& os);
- /**
+ /**
* Appends a string into the buffer and
* fixes the buffer to use char characters.
* @param msg message to append.
@@ -626,7 +626,7 @@
WideMessageBuffer& operator<<(const wchar_t msg);
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
- /**
+ /**
* Appends a string into the buffer and
* fixes the buffer to use char characters.
* @param msg message to append.
@@ -657,7 +657,7 @@
#endif
#if LOG4CXX_CFSTRING_API
- /**
+ /**
* Appends a string into the buffer and
* fixes the buffer to use char characters.
* @param msg message to append.
@@ -734,38 +734,38 @@
* @return encapsulated STL stream.
*/
std::ostream& operator<<(void* val);
- /**
- * Get content of buffer.
- * @param buf used only to signal
- * the character type and that
- * the embedded stream was not used.
- */
- const std::wstring& str(WideMessageBuffer& buf);
-
- /**
- * Get content of buffer.
- * @param os used only to signal
- * the character type and that
- * the embedded stream was used.
- */
- const std::wstring& str(std::basic_ostream<wchar_t>& os);
+ /**
+ * Get content of buffer.
+ * @param buf used only to signal
+ * the character type and that
+ * the embedded stream was not used.
+ */
+ const std::wstring& str(WideMessageBuffer& buf);
+
+ /**
+ * Get content of buffer.
+ * @param os used only to signal
+ * the character type and that
+ * the embedded stream was used.
+ */
+ const std::wstring& str(std::basic_ostream<wchar_t>& os);
#if LOG4CXX_UNICHAR_API || LOG4CXX_CFSTRING_API
- /**
- * Get content of buffer.
- * @param buf used only to signal
- * the character type and that
- * the embedded stream was not used.
- */
- const std::basic_string<UniChar>& str(UniCharMessageBuffer& buf);
-
- /**
- * Get content of buffer.
- * @param os used only to signal
- * the character type and that
- * the embedded stream was used.
- */
- const std::basic_string<UniChar>& str(UniCharMessageBuffer::uostream& os);
+ /**
+ * Get content of buffer.
+ * @param buf used only to signal
+ * the character type and that
+ * the embedded stream was not used.
+ */
+ const std::basic_string<UniChar>& str(UniCharMessageBuffer& buf);
+
+ /**
+ * Get content of buffer.
+ * @param os used only to signal
+ * the character type and that
+ * the embedded stream was used.
+ */
+ const std::basic_string<UniChar>& str(UniCharMessageBuffer::uostream& os);
#endif
/**
@@ -803,7 +803,7 @@
template<class V>
std::ostream& operator<<(MessageBuffer& os, const V& val) {
- return ((std::ostream&) os) << val;
+ return ((std::ostream&) os) << val;
}
#if LOG4CXX_LOGCHAR_IS_UTF8
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h Tue Feb 12 17:23:18 2008
@@ -96,7 +96,7 @@
namespace helpers
{
- class Pool;
+ class Pool;
/** base class for java-like objects.*/
class LOG4CXX_EXPORT Object
@@ -109,7 +109,7 @@
virtual bool instanceof(const Class& clazz) const = 0;
virtual const void * cast(const Class& clazz) const = 0;
};
- LOG4CXX_PTR_DEF(Object);
+ LOG4CXX_PTR_DEF(Object);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h Tue Feb 12 17:23:18 2008
@@ -37,15 +37,15 @@
{
namespace helpers
{
- class Class;
+ class Class;
class LOG4CXX_EXPORT ObjectPtrBase {
public:
- ObjectPtrBase();
- virtual ~ObjectPtrBase();
+ ObjectPtrBase();
+ virtual ~ObjectPtrBase();
static void checkNull(const int& null);
static void* exchange(void** destination, void* newValue);
- virtual void* cast(const Class& cls) const = 0;
+ virtual void* cast(const Class& cls) const = 0;
};
@@ -86,19 +86,19 @@
}
}
- ObjectPtrT(const ObjectPtrBase& p1)
- _LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass())))
+ ObjectPtrT(const ObjectPtrBase& p1)
+ _LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass())))
if (this->p != 0) {
this->p->addRef();
}
- }
+ }
- ObjectPtrT(ObjectPtrBase& p1)
- _LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass())))
+ ObjectPtrT(ObjectPtrBase& p1)
+ _LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass())))
if (this->p != 0) {
this->p->addRef();
}
- }
+ }
~ObjectPtrT()
@@ -159,22 +159,22 @@
return *this;
}
- ObjectPtrT& operator=(ObjectPtrBase& p1) {
- T* newPtr = reinterpret_cast<T*>(p1.cast(T::getStaticClass()));
- return operator=(newPtr);
- }
-
- ObjectPtrT& operator=(const ObjectPtrBase& p1) {
- T* newPtr = reinterpret_cast<T*>(p1.cast(T::getStaticClass()));
- return operator=(newPtr);
- }
+ ObjectPtrT& operator=(ObjectPtrBase& p1) {
+ T* newPtr = reinterpret_cast<T*>(p1.cast(T::getStaticClass()));
+ return operator=(newPtr);
+ }
+
+ ObjectPtrT& operator=(const ObjectPtrBase& p1) {
+ T* newPtr = reinterpret_cast<T*>(p1.cast(T::getStaticClass()));
+ return operator=(newPtr);
+ }
bool operator==(const ObjectPtrT& p1) const { return (this->p == p1.p); }
bool operator!=(const ObjectPtrT& p1) const { return (this->p != p1.p); }
- bool operator<(const ObjectPtrT& p1) const { return (this->p < p1.p); }
+ bool operator<(const ObjectPtrT& p1) const { return (this->p < p1.p); }
bool operator==(const T* p1) const { return (this->p == p1); }
bool operator!=(const T* p1) const { return (this->p != p1); }
- bool operator<(const T* p1) const { return (this->p < p1); }
+ bool operator<(const T* p1) const { return (this->p < p1); }
T* operator->() const {return (T*) p; }
T& operator*() const {return (T&) *p; }
operator T*() const {return (T*) p; }
@@ -183,12 +183,12 @@
private:
T * p;
- virtual void* cast(const Class& cls) const {
- if (p != 0) {
- return const_cast<void*>(p->cast(cls));
- }
- return 0;
- }
+ virtual void* cast(const Class& cls) const {
+ if (p != 0) {
+ return const_cast<void*>(p->cast(cls));
+ }
+ return 0;
+ }
};
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h Tue Feb 12 17:23:18 2008
@@ -54,7 +54,7 @@
protected:
Properties properties;
}; // class PropertyResourceBundle
- LOG4CXX_PTR_DEF(PropertyResourceBundle);
+ LOG4CXX_PTR_DEF(PropertyResourceBundle);
} // namespace helpers
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemerrwriter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemerrwriter.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemerrwriter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemerrwriter.h Tue Feb 12 17:23:18 2008
@@ -49,7 +49,7 @@
private:
SystemErrWriter(const SystemErrWriter&);
SystemErrWriter& operator=(const SystemErrWriter&);
- static bool isWide();
+ static bool isWide();
};
} // namespace helpers
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemoutwriter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemoutwriter.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemoutwriter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/systemoutwriter.h Tue Feb 12 17:23:18 2008
@@ -45,10 +45,10 @@
static void write(const LogString& str);
static void flush();
- private:
+ private:
SystemOutWriter(const SystemOutWriter&);
SystemOutWriter& operator=(const SystemOutWriter&);
- static bool isWide();
+ static bool isWide();
};
} // namespace helpers
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/thread.h Tue Feb 12 17:23:18 2008
@@ -38,7 +38,7 @@
class ThreadLocal;
typedef void log4cxx_thread_t;
- typedef void* (LOG4CXX_THREAD_FUNC *Runnable)(log4cxx_thread_t* thread, void* data);
+ typedef void* (LOG4CXX_THREAD_FUNC *Runnable)(log4cxx_thread_t* thread, void* data);
/**
* This class implements an approximation of java.util.Thread.
*/
@@ -113,7 +113,7 @@
static void* operator new(size_t, Pool& p);
/**
* operator delete would be called if exception during construction.
- */
+ */
static void operator delete(void*, Pool& p);
/**
* Create new instance.
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h Tue Feb 12 17:23:18 2008
@@ -69,7 +69,7 @@
virtual XMLDOMNodeType getNodeType() = 0;
virtual XMLDOMDocumentPtr getOwnerDocument() = 0;
};
- LOG4CXX_PTR_DEF(XMLDOMNode);
+ LOG4CXX_PTR_DEF(XMLDOMNode);
/**
@@ -82,7 +82,7 @@
virtual LogString getTagName() = 0;
virtual LogString getAttribute(const LogString& name) = 0;
};
- LOG4CXX_PTR_DEF(XMLDOMElement);
+ LOG4CXX_PTR_DEF(XMLDOMElement);
/**
The XMLDOMDocument interface represents an entire XML document.
@@ -99,7 +99,7 @@
virtual XMLDOMElementPtr getElementById(const LogString& tagName,
const LogString& elementId) = 0;
};
- LOG4CXX_PTR_DEF(XMLDOMDocument);
+ LOG4CXX_PTR_DEF(XMLDOMDocument);
/**
The XMLDOMNodeList interface provides the abstraction of an ordered
@@ -118,7 +118,7 @@
virtual int getLength() = 0;
virtual XMLDOMNodePtr item(int index) = 0;
};
- LOG4CXX_PTR_DEF(XMLDOMNodeList);
+ LOG4CXX_PTR_DEF(XMLDOMNodeList);
} // namespace helpers
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h Tue Feb 12 17:23:18 2008
@@ -116,7 +116,7 @@
{ return false; }
}; // class HtmlLayout
- LOG4CXX_PTR_DEF(HTMLLayout);
+ LOG4CXX_PTR_DEF(HTMLLayout);
} // namespace log4cxx
#endif // _LOG4CXX_HTML_LAYOUT_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h Tue Feb 12 17:23:18 2008
@@ -133,7 +133,7 @@
SyslogAppender(const SyslogAppender&);
SyslogAppender& operator=(const SyslogAppender&);
}; // class SyslogAppender
- LOG4CXX_PTR_DEF(SyslogAppender);
+ LOG4CXX_PTR_DEF(SyslogAppender);
} // namespace net
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h Tue Feb 12 17:23:18 2008
@@ -398,7 +398,7 @@
protected:
virtual log4cxx::pattern::PatternMap getFormatSpecifiers();
};
- LOG4CXX_PTR_DEF(PatternLayout)
+ LOG4CXX_PTR_DEF(PatternLayout)
} // namespace log4cxx
#if defined(_MSC_VER)
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h Tue Feb 12 17:23:18 2008
@@ -17,11 +17,11 @@
#if !defined(_LOG4CXX_ROLLING_GZ_COMPRESS_ACTION_H)
#define _LOG4CXX_ROLLING_GZ_COMPRESS_ACTION_H
-
-#if defined(_MSC_VER)
-#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
-#endif
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/rolling/action.h>
#include <log4cxx/file.h>
@@ -63,11 +63,11 @@
LOG4CXX_PTR_DEF(GZCompressAction);
}
-}
-
-#if defined(_MSC_VER)
-#pragma warning ( pop )
-#endif
+}
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h Tue Feb 12 17:23:18 2008
@@ -16,12 +16,12 @@
*/
#if !defined(_LOG4CXX_ROLLING_ZIP_COMPRESS_ACTION_H)
-#define _LOG4CXX_ROLLING_ZIP_COMPRESS_ACTION_H
-
-#if defined(_MSC_VER)
-#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
-#endif
+#define _LOG4CXX_ROLLING_ZIP_COMPRESS_ACTION_H
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/rolling/action.h>
@@ -63,11 +63,11 @@
LOG4CXX_PTR_DEF(ZipCompressAction);
- }
-
-#if defined(_MSC_VER)
-#pragma warning ( pop )
-#endif
+ }
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
}
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h Tue Feb 12 17:23:18 2008
@@ -46,8 +46,8 @@
END_LOG4CXX_CAST_MAP()
/** The default constructor simply calls its {@link FileAppender#FileAppender parents constructor}. */
RollingFileAppender();
- void addRef() const;
- void releaseRef() const;
+ void addRef() const;
+ void releaseRef() const;
/**
Instantiate a RollingFileAppender and open the file designated by
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h Tue Feb 12 17:23:18 2008
@@ -66,7 +66,7 @@
virtual void setOption(const LogString& /* option */,
const LogString& /* value */) {}
};
- LOG4CXX_PTR_DEF(SimpleLayout);
+ LOG4CXX_PTR_DEF(SimpleLayout);
} // namespace log4cxx
#endif //_LOG4CXX_SIMPLE_LAYOUT_H
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=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h Tue Feb 12 17:23:18 2008
@@ -27,8 +27,8 @@
namespace log4cxx
{
- class Logger;
- class Appender;
+ class Logger;
+ class Appender;
namespace spi
@@ -42,12 +42,12 @@
virtual ~HierarchyEventListener() {}
virtual void addAppenderEvent(
- const log4cxx::helpers::ObjectPtrT<Logger>& logger,
- const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0;
+ const log4cxx::helpers::ObjectPtrT<Logger>& logger,
+ const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0;
virtual void removeAppenderEvent(
- const log4cxx::helpers::ObjectPtrT<Logger>& logger,
- const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0;
+ const log4cxx::helpers::ObjectPtrT<Logger>& logger,
+ const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0;
};
LOG4CXX_PTR_DEF(HierarchyEventListener)
LOG4CXX_LIST_DEF(HierarchyEventListenerList, HierarchyEventListenerPtr)
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h Tue Feb 12 17:23:18 2008
@@ -47,7 +47,7 @@
virtual ~RepositorySelector() {}
virtual LoggerRepositoryPtr& getLoggerRepository() = 0;
};
- LOG4CXX_PTR_DEF(RepositorySelector);
+ LOG4CXX_PTR_DEF(RepositorySelector);
} //namespace spi
} //namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.h?rev=627213&r1=627212&r2=627213&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.h Tue Feb 12 17:23:18 2008
@@ -43,7 +43,7 @@
*/
virtual bool isTriggeringEvent(const spi::LoggingEventPtr& event) = 0;
};
- LOG4CXX_PTR_DEF(TriggeringEventEvaluator);
+ LOG4CXX_PTR_DEF(TriggeringEventEvaluator);
}
}