unsubscribe On Thu, Feb 21, 2008 at 3:29 AM, <[EMAIL PROTECTED]> wrote:
> Author: carnold > Date: Thu Feb 21 00:29:02 2008 > New Revision: 629717 > > URL: http://svn.apache.org/viewvc?rev=629717&view=rev > Log: > LOGCXX-115: Borland C++ fixes > > Modified: > logging/log4cxx/trunk/build.xml > logging/log4cxx/trunk/src/ant/apr-build.xml > logging/log4cxx/trunk/src/main/cpp/layout.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/optionconverter.cpp > logging/log4cxx/trunk/src/main/cpp/socketoutputstream.cpp > logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp > logging/log4cxx/trunk/src/main/cpp/transcoder.cpp > logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp > logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h > logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h > logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw > > logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw > > > logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h > logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h > > Modified: logging/log4cxx/trunk/build.xml > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/build.xml (original) > +++ logging/log4cxx/trunk/build.xml Thu Feb 21 00:29:02 2008 > @@ -533,6 +533,9 @@ > <condition property="resource.compiler" value="windres"> > <isset property="is-gcc"/> > </condition> > + <condition property="resource.compiler" value="brc"> > + <isset property="is-bcc"/> > + </condition> > <property name="resource.compiler" value="msrc"/> > > <cc name="${project.compiler}" > > Modified: logging/log4cxx/trunk/src/ant/apr-build.xml > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/apr-build.xml?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/ant/apr-build.xml (original) > +++ logging/log4cxx/trunk/src/ant/apr-build.xml Thu Feb 21 00:29:02 2008 > @@ -64,8 +64,13 @@ > </target> > > <target name="win-configure" if="is-windows"> > + <copy file="${include.dir}/apr.hw" tofile="${include.dir}/apr.tmp" > overwrite="true"/> > + <replaceregexp file="${include.dir}/apr.tmp" > + match="typedef *int *uid_t;" replace="/* typedef int uid_t */"/> > + <replaceregexp file="${include.dir}/apr.tmp" > + match="typedef *int *gid_t;" replace="/* typedef int gid_t */"/> > <antcall target="copy-if-changed"> > - <param name="file" value="${include.dir}/apr.hw"/> > + <param name="file" value="${include.dir}/apr.tmp"/> > <param name="tofile" value="${include.dir}/apr.h"/> > </antcall> > </target> > > Modified: logging/log4cxx/trunk/src/main/cpp/layout.cpp > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/layout.cpp?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/cpp/layout.cpp (original) > +++ logging/log4cxx/trunk/src/main/cpp/layout.cpp Thu Feb 21 00:29:02 2008 > @@ -25,11 +25,11 @@ > Layout::~Layout() {} > > void Layout::addRef() const { > - ObjectImpl::addRef(); > + log4cxx::helpers::ObjectImpl::addRef(); > } > > void Layout::releaseRef() const { > - ObjectImpl::releaseRef(); > + log4cxx::helpers::ObjectImpl::releaseRef(); > } > > LogString Layout::getContentType() const { return > LOG4CXX_STR("text/plain"); } > > Modified: logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp (original) > +++ logging/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp Thu Feb 21 > 00:29:02 2008 > @@ -217,7 +217,7 @@ > ::HKEY hkey = 0; > LogString > subkey(LOG4CXX_STR("SYSTEM\\CurrentControlSet\\Services\\EventLog\\")); > subkey.append(log); > - subkey.append(1, 0x5C /* '\\' */); > + subkey.append(1, (logchar) 0x5C /* '\\' */); > subkey.append(source); > LOG4CXX_ENCODE_WCHAR(wsubkey, subkey); > > > Modified: logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp (original) > +++ logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp Thu Feb 21 > 00:29:02 2008 > @@ -70,8 +70,8 @@ > dataBuf.flip(); > size_t len = dataBuf.limit(); > #endif > - bytes[1] = len & 0xFF; > - bytes[0] = (len >> 8) & 0xFF; > + bytes[1] = (char) (len & 0xFF); > + bytes[0] = (char) ((len >> 8) & 0xFF); > ByteBuffer lenBuf(bytes, sizeof(bytes)); > os->write(lenBuf, p); > os->write(dataBuf, p); > @@ -100,10 +100,10 @@ > os->write(dataBuf, p); > char size[4]; > size_t sz = val.size(); > - size[3] = sz & 0xFF; > - size[2] = (sz >> 8) & 0xFF; > - size[1] = (sz >> 16) & 0xFF; > - size[0] = (sz >> 24) & 0xFF; > + size[3] = (char) (sz & 0xFF); > + size[2] = (char) ((sz >> 8) & 0xFF); > + size[1] = (char) ((sz >> 16) & 0xFF); > + size[0] = (char) ((sz >> 24) & 0xFF); > ByteBuffer sizeBuf(size, sizeof(size)); > os->write(sizeBuf, p); > for(MDC::Map::const_iterator iter = val.begin(); > @@ -121,8 +121,8 @@ > ByteBuffer dataBuf(const_cast<char*>(val.data()), val.size()); > objectHandle++; > bytes[0] = 0x74; > - bytes[1] = (len >> 8) & 0xFF; > - bytes[2] = len & 0xFF; > + bytes[1] = (char) ((len >> 8) & 0xFF); > + bytes[2] = (char) (len & 0xFF); > ByteBuffer lenBuf(bytes, sizeof(bytes)); > os->write(lenBuf, p); > os->write(dataBuf, p); > @@ -137,24 +137,24 @@ > > void ObjectOutputStream::writeInt(int val, Pool& p) { > char bytes[4]; > - bytes[3] = val & 0xFF; > - bytes[2] = (val >> 8) & 0xFF; > - bytes[1] = (val >> 16) & 0xFF; > - bytes[0] = (val >> 24) & 0xFF; > + bytes[3] = (char) (val & 0xFF); > + bytes[2] = (char) ((val >> 8) & 0xFF); > + bytes[1] = (char) ((val >> 16) & 0xFF); > + bytes[0] = (char) ((val >> 24) & 0xFF); > ByteBuffer buf(bytes, sizeof(bytes)); > os->write(buf, p); > } > > void ObjectOutputStream::writeLong(log4cxx_time_t val, Pool& p) { > char bytes[8]; > - bytes[7] = val & 0xFF; > - bytes[6] = (val >> 8) & 0xFF; > - bytes[5] = (val >> 16) & 0xFF; > - bytes[4] = (val >> 24) & 0xFF; > - bytes[3] = (val >> 32) & 0xFF; > - bytes[2] = (val >> 40) & 0xFF; > - bytes[1] = (val >> 48) & 0xFF; > - bytes[0] = (val >> 56) & 0xFF; > + bytes[7] = (char) (val & 0xFF); > + bytes[6] = (char) ((val >> 8) & 0xFF); > + bytes[5] = (char) ((val >> 16) & 0xFF); > + bytes[4] = (char) ((val >> 24) & 0xFF); > + bytes[3] = (char) ((val >> 32) & 0xFF); > + bytes[2] = (char) ((val >> 40) & 0xFF); > + bytes[1] = (char) ((val >> 48) & 0xFF); > + bytes[0] = (char) ((val >> 56) & 0xFF); > ByteBuffer buf(bytes, sizeof(bytes)); > os->write(buf, p); > } > @@ -178,10 +178,10 @@ > char bytes[6]; > bytes[0] = TC_OBJECT; > bytes[1] = TC_REFERENCE; > - bytes[2] = (match->second >> 24) & 0xFF; > - bytes[3] = (match->second >> 16) & 0xFF; > - bytes[4] = (match->second >> 8) & 0xFF; > - bytes[5] = match->second & 0xFF; > + bytes[2] = (char) ((match->second >> 24) & 0xFF); > + bytes[3] = (char) ((match->second >> 16) & 0xFF); > + bytes[4] = (char) ((match->second >> 8) & 0xFF); > + bytes[5] = (char) (match->second & 0xFF); > ByteBuffer buf(bytes, sizeof(bytes)); > os->write(buf, p); > objectHandle++; > > Modified: logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp (original) > +++ logging/log4cxx/trunk/src/main/cpp/odbcappender.cpp Thu Feb 21 > 00:29:02 2008 > @@ -89,7 +89,7 @@ > } > > > -void ODBCAppender::append(const spi::LoggingEventPtr& event, > log4cxx::helpers::Pool& p) > +void ODBCAppender::append(const spi::LoggingEventPtr& event, > log4cxx::helpers::Pool& /* p */) > { > #if LOG4CXX_HAVE_ODBC > buffer.push_back(event); > @@ -151,7 +151,7 @@ > > /* The default behavior holds a single connection open until the appender > is closed (typically when garbage collected).*/ > -void ODBCAppender::closeConnection(ODBCAppender::SQLHDBC con) > +void ODBCAppender::closeConnection(ODBCAppender::SQLHDBC /* con */) > { > } > > > Modified: logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp (original) > +++ logging/log4cxx/trunk/src/main/cpp/optionconverter.cpp Thu Feb 21 > 00:29:02 2008 > @@ -190,7 +190,7 @@ > k = val.find(delimStop, j); > if(k == -1) > { > - LogString msg(1, 0x22 /* '\"' */); > + LogString msg(1, (logchar) 0x22 /* '\"' */); > msg.append(val); > msg.append(LOG4CXX_STR("\" has no closing > brace. Opening brace at position ")); > Pool p; > @@ -203,7 +203,7 @@ > j += DELIM_START_LEN; > LogString key = val.substr(j, k - j); > // first try in System properties > - LogString replacement = > getSystemProperty(key, LogString()); > + LogString > replacement(getSystemProperty(key, LogString())); > // then try props parameter > if(replacement.empty()) > { > > Modified: logging/log4cxx/trunk/src/main/cpp/socketoutputstream.cpp > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/socketoutputstream.cpp?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/cpp/socketoutputstream.cpp (original) > +++ logging/log4cxx/trunk/src/main/cpp/socketoutputstream.cpp Thu Feb 21 > 00:29:02 2008 > @@ -37,7 +37,7 @@ > socket->close(); > } > > -void SocketOutputStream::flush(Pool& p) { > +void SocketOutputStream::flush(Pool& /* p */) { > if (array.size() > 0) { > socket->write(&array[0], array.size()); > array.resize(0); > > Modified: logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp (original) > +++ logging/log4cxx/trunk/src/main/cpp/threadcxx.cpp Thu Feb 21 00:29:02 > 2008 > @@ -93,7 +93,7 @@ > } > > #if APR_HAS_THREADS > -void* Thread::launcher(log4cxx_thread_t* thread, void* data) { > +void* LOG4CXX_THREAD_FUNC Thread::launcher(log4cxx_thread_t* thread, > void* data) { > LaunchPackage* package = (LaunchPackage*) data; > ThreadLocal& tls = getThreadLocal(); > tls.set(package->getThread()); > > Modified: logging/log4cxx/trunk/src/main/cpp/transcoder.cpp > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/transcoder.cpp?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/cpp/transcoder.cpp (original) > +++ logging/log4cxx/trunk/src/main/cpp/transcoder.cpp Thu Feb 21 00:29:02 > 2008 > @@ -26,7 +26,6 @@ > #include <vector> > #include <apr.h> > #include <apr_strings.h> > -#define LOG4CXX 1 > #include <log4cxx/private/log4cxx_private.h> > > #if LOG4CXX_LOGCHAR_IS_UNICHAR || LOG4CXX_CFSTRING_API || > LOG4CXX_UNICHAR_API > > Modified: logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp (original) > +++ logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp Thu Feb 21 > 00:29:02 2008 > @@ -26,9 +26,9 @@ > } > > void TriggeringPolicy::addRef() const { > - ObjectImpl::addRef(); > + log4cxx::helpers::ObjectImpl::addRef(); > } > > void TriggeringPolicy::releaseRef() const { > - ObjectImpl::releaseRef(); > + log4cxx::helpers::ObjectImpl::releaseRef(); > } > > Modified: logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h > (original) > +++ logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h Thu > Feb 21 00:29:02 2008 > @@ -35,15 +35,16 @@ > { > namespace db > { > - class LOG4CXX_EXPORT SQLException : public > helpers::Exception > + class LOG4CXX_EXPORT SQLException : public > log4cxx::helpers::Exception > { > public: > - SQLException(const LogString& msg) : Exception(msg) {} > - SQLException(const SQLException& src) : > Exception(src) { > - } > + SQLException(const LogString& msg) : > log4cxx::helpers::Exception(msg) { > + } > + SQLException(const SQLException& src) : > log4cxx::helpers::Exception(src) { > + } > > private: > - SQLException& operator=(const SQLException&); > + SQLException& operator=(const SQLException&); > }; > > class ODBCAppender; > > 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=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h > (original) > +++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h Thu > Feb 21 00:29:02 2008 > @@ -26,11 +26,11 @@ > > #define DECLARE_ABSTRACT_LOG4CXX_OBJECT(object)\ > public:\ > -class Class##object : public helpers::Class\ > +class Clazz##object : public helpers::Class\ > {\ > public:\ > - Class##object() : helpers::Class() {}\ > - virtual ~Class##object() {}\ > + Clazz##object() : helpers::Class() {}\ > + virtual ~Clazz##object() {}\ > virtual log4cxx::LogString getName() const { return > LOG4CXX_STR(#object); } \ > };\ > virtual const helpers::Class& getClass() const;\ > @@ -39,11 +39,11 @@ > > #define DECLARE_LOG4CXX_OBJECT(object)\ > public:\ > -class Class##object : public helpers::Class\ > +class Clazz##object : public helpers::Class\ > {\ > public:\ > - Class##object() : helpers::Class() {}\ > - virtual ~Class##object() {}\ > + Clazz##object() : helpers::Class() {}\ > + virtual ~Clazz##object() {}\ > virtual log4cxx::LogString getName() const { return > LOG4CXX_STR(#object); } \ > virtual helpers::ObjectPtr newInstance() const\ > {\ > @@ -63,7 +63,7 @@ > #define IMPLEMENT_LOG4CXX_OBJECT(object)\ > const log4cxx::helpers::Class& object::getClass() const { return > getStaticClass(); }\ > const log4cxx::helpers::Class& object::getStaticClass() { \ > - static Class##object theClass; \ > + static Clazz##object theClass; \ > return theClass; \ > } \ > const log4cxx::helpers::ClassRegistration& object::registerClass() { \ > > Modified: logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw (original) > +++ logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw Thu Feb 21 > 00:29:02 2008 > @@ -42,6 +42,8 @@ > #define LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE 1 > #define LOG4CXX_LOGSTREAM_ADD_NOP 1 > #endif > +#elif defined(__BORLANDC__) > +typedef __int64 log4cxx_int64_t; > #else > typedef long long log4cxx_int64_t; > #endif > > Modified: > logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- > logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw > (original) > +++ > logging/log4cxx/trunk/src/main/include/log4cxx/private/log4cxx_private.hw > Thu Feb 21 00:29:02 2008 > @@ -56,7 +56,11 @@ > > #if !defined(_WIN32_WCE) > #define LOG4CXX_HAVE_ODBC 1 > +#if defined(__BORLANDC__) > +#define LOG4CXX_HAS_MBSRTOWCS 0 > +#else > #define LOG4CXX_HAS_MBSRTOWCS 1 > +#endif > #else > #define LOG4CXX_HAVE_ODBC 0 > #define LOG4CXX_HAS_MBSRTOWCS 0 > > Modified: > logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- > logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h > (original) > +++ > logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h > Thu Feb 21 00:29:02 2008 > @@ -40,8 +40,8 @@ > : repository(repository1) > { > } > - void addRef() const { ObjectImpl::addRef(); } > - void releaseRef() const { > ObjectImpl::releaseRef(); } > + void addRef() const { > log4cxx::helpers::ObjectImpl::addRef(); } > + void releaseRef() const { > log4cxx::helpers::ObjectImpl::releaseRef(); } > > virtual LoggerRepositoryPtr& getLoggerRepository() > { > > Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h > URL: > http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h?rev=629717&r1=629716&r2=629717&view=diff > > ============================================================================== > --- logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h (original) > +++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h Thu Feb 21 > 00:29:02 2008 > @@ -77,8 +77,8 @@ > Filter() : next() { > } > > - void addRef() const { ObjectImpl::addRef(); } > - void releaseRef() const { > ObjectImpl::releaseRef(); } > + void addRef() const { > log4cxx::helpers::ObjectImpl::addRef(); } > + void releaseRef() const { > log4cxx::helpers::ObjectImpl::releaseRef(); } > > DECLARE_ABSTRACT_LOG4CXX_OBJECT(Filter) > BEGIN_LOG4CXX_CAST_MAP() > > >
