[asterisk-scf-commits] asterisk-scf/integration/logger.git branch "retry_deux" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Feb 27 09:30:33 CST 2012
branch "retry_deux" has been updated
via 1503c024f77521c2bda47c903ca2ee66e360fc96 (commit)
via 4389c3a7a5c2d1aca9d9eb7308a4539627f2cd6f (commit)
via d41d04fc1b3d95543c5421091bebc92e498ed508 (commit)
via 23ee84be343bcf26f75cd325ce2e76568b3f8cd0 (commit)
from de46b50bdac5daa35d2075c49ec2012329173073 (commit)
Summary of changes:
client/src/IceLogger.cpp | 16 +++++++------
client/src/OstreamLogger.cpp | 4 ++-
client/test/Logger-test.cpp | 4 ++-
.../AsteriskSCF/Boost/FixIpcDetail.h | 23 +++++++++++--------
4 files changed, 28 insertions(+), 19 deletions(-)
copy server/src/OstreamChainedLogOut.cpp => include/AsteriskSCF/Boost/FixIpcDetail.h (52%)
- Log -----------------------------------------------------------------
commit 1503c024f77521c2bda47c903ca2ee66e360fc96
Author: Brent Eagles <beagles at digium.com>
Date: Mon Feb 27 11:59:54 2012 -0330
Address build issues on non-MS compilers (unused parameters).
diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index 3561314..cfcb321 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -173,7 +173,7 @@ void ConfiguredIceLogger::locateFinished(const Ice::AsyncResultPtr& r)
}
void ConfiguredIceLogger::comparisonRegistered(
- const OperationContextPtr& operationContext,
+ const OperationContextPtr& /* operationContext */,
const std::string& /* guid */,
const Ice::Current&)
{
@@ -181,7 +181,7 @@ void ConfiguredIceLogger::comparisonRegistered(
}
void ConfiguredIceLogger::comparisonUnregistered(
- const OperationContextPtr& operationContext,
+ const OperationContextPtr& /* operationContext */,
const std::string& /* guid */,
const Ice::Current&)
{
@@ -189,7 +189,7 @@ void ConfiguredIceLogger::comparisonUnregistered(
}
void ConfiguredIceLogger::serviceRegistered(
- const OperationContextPtr& operationContext,
+ const OperationContextPtr& /* operationContext */,
const std::string& guid,
const Ice::Current&)
{
@@ -200,7 +200,7 @@ void ConfiguredIceLogger::serviceRegistered(
}
void ConfiguredIceLogger::serviceUnregistered(
- const OperationContextPtr& operationContext,
+ const OperationContextPtr& /* operationContext */,
const std::string& guid,
const Ice::Current&)
{
@@ -211,7 +211,7 @@ void ConfiguredIceLogger::serviceUnregistered(
}
void ConfiguredIceLogger::serviceSuspended(
- const OperationContextPtr& operationContext,
+ const OperationContextPtr& /* operationContext */,
const std::string& guid,
const Ice::Current&)
{
@@ -222,7 +222,7 @@ void ConfiguredIceLogger::serviceSuspended(
}
void ConfiguredIceLogger::serviceUnsuspended(
- const OperationContextPtr& operationContext,
+ const OperationContextPtr& /* operationContext */,
const std::string& guid,
const Ice::Current&)
{
commit 4389c3a7a5c2d1aca9d9eb7308a4539627f2cd6f
Merge: d41d04f de46b50
Author: Brent Eagles <beagles at digium.com>
Date: Fri Feb 24 12:23:44 2012 -0330
Merge branch 'retry_deux' of ssh://git.asterisk.org/asterisk-scf/integration/logger into retry_deux
diff --cc client/src/IceLogger.cpp
index 2924142,78c6170..3561314
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@@ -25,10 -25,9 +25,11 @@@
#include <AsteriskSCF/Logger/Level.h>
#include <AsteriskSCF/Logger/LogConsts.h>
+#include <AsteriskSCF/Boost/FixIpcDetail.h>
+
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::System::Logging;
+ using namespace AsteriskSCF::System::V1;
void IceLogger::logs(const std::string& name, Level logLevel,
const std::string& message)
commit d41d04fc1b3d95543c5421091bebc92e498ed508
Merge: a1c6ba6 23ee84b
Author: Brent Eagles <beagles at digium.com>
Date: Tue Feb 7 13:52:32 2012 -0330
Merge remote-tracking branch 'origin/master' into retry_deux
commit 23ee84be343bcf26f75cd325ce2e76568b3f8cd0
Author: David M. Lee <dlee at digium.com>
Date: Mon Feb 6 10:24:16 2012 -0600
Fixed for boost-1.48
diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index ca1a7f7..2924142 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -25,6 +25,8 @@
#include <AsteriskSCF/Logger/Level.h>
#include <AsteriskSCF/Logger/LogConsts.h>
+#include <AsteriskSCF/Boost/FixIpcDetail.h>
+
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::System::Logging;
@@ -43,7 +45,7 @@ void IceLogger::logs(const std::string& name, Level logLevel,
logLevel,
message,
hostName,
- (Ice::Long)boost::interprocess::detail::get_current_process_id(),
+ (Ice::Long)boost::interprocess::ipcdetail::get_current_process_id(),
mComponentCategory,
mComponentServiceName,
mComponentId);
diff --git a/client/src/OstreamLogger.cpp b/client/src/OstreamLogger.cpp
index 8d50274..b4f1221 100644
--- a/client/src/OstreamLogger.cpp
+++ b/client/src/OstreamLogger.cpp
@@ -22,6 +22,8 @@
#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Logger/LogFormatter.h>
+#include <AsteriskSCF/Boost/FixIpcDetail.h>
+
using namespace AsteriskSCF::System::Logging;
namespace
@@ -33,7 +35,7 @@ public:
OstreamLogger(std::ostream& out, const std::string& fmtStr = DefaultLogFormat) :
mOut(out), mFormatter(fmtStr)
{
- mProcessId = (Ice::Long)boost::interprocess::detail::get_current_process_id();
+ mProcessId = (Ice::Long)boost::interprocess::ipcdetail::get_current_process_id();
mHostName = boost::asio::ip::host_name();
}
diff --git a/client/test/Logger-test.cpp b/client/test/Logger-test.cpp
index 18c48d9..8200440 100644
--- a/client/test/Logger-test.cpp
+++ b/client/test/Logger-test.cpp
@@ -24,6 +24,8 @@
#include <AsteriskSCF/Logger.h>
#include "ExpectedLogOut.h"
+#include <AsteriskSCF/Boost/FixIpcDetail.h>
+
using namespace std;
using namespace AsteriskSCF::System::Logging;
@@ -150,7 +152,7 @@ BOOST_AUTO_TEST_CASE(test_stream_timestamp)
{
boost::posix_time::ptime now(boost::posix_time::microsec_clock::universal_time());
- Ice::Long pid = (Ice::Long)boost::interprocess::detail::get_current_process_id();
+ Ice::Long pid = (Ice::Long)boost::interprocess::ipcdetail::get_current_process_id();
std::string nowStr = getFormattedTime(now);
ExpectedLogOut out(boost::lexical_cast<std::string>(pid) + ":src:Debug:TimeStamp test:Logger-test.cpp : " + nowStr,
diff --git a/include/AsteriskSCF/Boost/FixIpcDetail.h b/include/AsteriskSCF/Boost/FixIpcDetail.h
new file mode 100644
index 0000000..eab1d9d
--- /dev/null
+++ b/include/AsteriskSCF/Boost/FixIpcDetail.h
@@ -0,0 +1,31 @@
+/*
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2012, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
+#pragma once
+
+// while one would think this file belongs in util-cpp, it's needed by the
+// logger client, and util-cpp depends on the logger
+
+#include <boost/interprocess/detail/os_thread_functions.hpp>
+#include <boost/version.hpp>
+
+// In Boost 1.48, detail was changes to ipcdetail to fix some bugs with MSVC
+#if BOOST_VERSION < 104800
+namespace boost {
+namespace interprocess {
+namespace ipcdetail = detail;
+}
+}
+#endif
-----------------------------------------------------------------------
--
asterisk-scf/integration/logger.git
More information about the asterisk-scf-commits
mailing list