You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2022/12/17 19:50:47 UTC
[logging-log4cxx] branch LOGCXX-564 created (now f25557ec)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a change to branch LOGCXX-564
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
at f25557ec LOGCXX-564 Moved typedefs into log4cxx namespace
This branch includes the following new commits:
new f25557ec LOGCXX-564 Moved typedefs into log4cxx namespace
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[logging-log4cxx] 01/01: LOGCXX-564 Moved typedefs into log4cxx namespace
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch LOGCXX-564
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit f25557ec8760c52dd028345cf0e9649099998a8e
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Sat Dec 17 14:50:32 2022 -0500
LOGCXX-564 Moved typedefs into log4cxx namespace
---
src/main/cpp/class.cpp | 2 +-
src/main/cpp/relativetimedateformat.cpp | 2 +-
src/main/cpp/stringhelper.cpp | 8 ++++----
src/main/include/log4cxx/helpers/stringhelper.h | 4 ++--
src/main/include/log4cxx/log4cxx.h.in | 14 +++++++++-----
5 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/cpp/class.cpp b/src/main/cpp/class.cpp
index c16f2cf1..78cfa347 100644
--- a/src/main/cpp/class.cpp
+++ b/src/main/cpp/class.cpp
@@ -74,7 +74,7 @@ using namespace log4cxx::filter;
using namespace log4cxx::xml;
using namespace log4cxx::rolling;
-log4cxx_uint32_t libraryVersion(){
+uint32_t libraryVersion(){
// This function defined in log4cxx.h
return LOG4CXX_VERSION;
}
diff --git a/src/main/cpp/relativetimedateformat.cpp b/src/main/cpp/relativetimedateformat.cpp
index 70c486f2..ce33f147 100644
--- a/src/main/cpp/relativetimedateformat.cpp
+++ b/src/main/cpp/relativetimedateformat.cpp
@@ -34,6 +34,6 @@ void log4cxx::helpers::RelativeTimeDateFormat::format(
log4cxx_time_t date,
Pool& p) const
{
- log4cxx_int64_t interval = (date - startTime) / APR_INT64_C(1000);
+ int64_t interval = (date - startTime) / APR_INT64_C(1000);
StringHelper::toString(interval, p, s);
}
diff --git a/src/main/cpp/stringhelper.cpp b/src/main/cpp/stringhelper.cpp
index 6dcce0e6..78a7821a 100644
--- a/src/main/cpp/stringhelper.cpp
+++ b/src/main/cpp/stringhelper.cpp
@@ -124,7 +124,7 @@ int StringHelper::toInt(const LogString& s)
return atoi(as.c_str());
}
-log4cxx_int64_t StringHelper::toInt64(const LogString& s)
+int64_t StringHelper::toInt64(const LogString& s)
{
std::string as;
Transcoder::encode(s, as);
@@ -150,7 +150,7 @@ void StringHelper::toString(bool val, LogString& dst)
}
-void StringHelper::toString(log4cxx_int64_t n, Pool& pool, LogString& dst)
+void StringHelper::toString(int64_t n, Pool& pool, LogString& dst)
{
if (n >= INT_MIN && n <= INT_MAX)
{
@@ -158,7 +158,7 @@ void StringHelper::toString(log4cxx_int64_t n, Pool& pool, LogString& dst)
}
else
{
- const log4cxx_int64_t BILLION = APR_INT64_C(1000000000);
+ const int64_t BILLION = APR_INT64_C(1000000000);
int billions = (int) (n / BILLION);
char* upper = pool.itoa(billions);
int remain = (int) (n - billions * BILLION);
@@ -178,7 +178,7 @@ void StringHelper::toString(log4cxx_int64_t n, Pool& pool, LogString& dst)
void StringHelper::toString(size_t n, Pool& pool, LogString& s)
{
- toString((log4cxx_int64_t) n, pool, s);
+ toString((int64_t) n, pool, s);
}
LogString StringHelper::format(const LogString& pattern, const std::vector<LogString>& params)
diff --git a/src/main/include/log4cxx/helpers/stringhelper.h b/src/main/include/log4cxx/helpers/stringhelper.h
index cfbb0c21..3a1cec3b 100644
--- a/src/main/include/log4cxx/helpers/stringhelper.h
+++ b/src/main/include/log4cxx/helpers/stringhelper.h
@@ -43,10 +43,10 @@ class LOG4CXX_EXPORT StringHelper
static int toInt(const LogString& s);
- static log4cxx_int64_t toInt64(const LogString& s);
+ static int64_t toInt64(const LogString& s);
static void toString(int i, log4cxx::helpers::Pool& pool, LogString& dst);
- static void toString(log4cxx_int64_t i, log4cxx::helpers::Pool& pool, LogString& dst);
+ static void toString(int64_t i, log4cxx::helpers::Pool& pool, LogString& dst);
static void toString(size_t i, log4cxx::helpers::Pool& pool, LogString& dst);
static void toString(bool val, LogString& dst);
diff --git a/src/main/include/log4cxx/log4cxx.h.in b/src/main/include/log4cxx/log4cxx.h.in
index 12ed0dbc..27d3b33e 100644
--- a/src/main/include/log4cxx/log4cxx.h.in
+++ b/src/main/include/log4cxx/log4cxx.h.in
@@ -51,15 +51,12 @@
#define LOG4CXX_HAS_NETWORKING @NETWORKING_SUPPORT@
#define LOG4CXX_HAS_MULTIPROCESS_ROLLING_FILE_APPENDER @MULTIPROCESS_RFA@
-typedef long long log4cxx_int64_t;
#define LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE 0
#define LOG4CXX_LOGSTREAM_ADD_NOP 0
-typedef log4cxx_int64_t log4cxx_time_t;
-typedef int log4cxx_status_t;
-typedef unsigned int log4cxx_uint32_t;
#include "boost-std-configuration.h"
#include <memory>
+#include <cstdint>
#define LOG4CXX_PTR_DEF(T) typedef std::shared_ptr<T> T##Ptr;\
typedef std::weak_ptr<T> T##WeakPtr
@@ -100,6 +97,13 @@ __pragma( warning( pop ) )
namespace log4cxx {
+/**
+ * log4cxx_time_t - holds the number of microseconds since 1970-01-01
+ */
+typedef int64_t log4cxx_time_t;
+
+typedef int log4cxx_status_t;
+
/**
* Query the compiled version of the library. Ideally, this should
* be the same as the LOG4CXX_VERSION macro defined above.
@@ -107,7 +111,7 @@ namespace log4cxx {
* The LOG4CXX_VERSION_GET_ series of macros let you extract the
* specific bytes of the version if required.
*/
-LOG4CXX_EXPORT log4cxx_uint32_t libraryVersion();
+LOG4CXX_EXPORT uint32_t libraryVersion();
}