Author: shuston
Date: Tue Feb 24 17:01:28 2015
New Revision: 1662026
URL: http://svn.apache.org/r1662026
Log:
Merge SystemInfo.cpp to 0.32 - QPID-6312
Added:
qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/
- copied from r1661449, qpid/trunk/qpid/cpp/src/qpid/sys/aix/
Modified:
qpid/branches/0.32/qpid/cpp/src/qpid/sys/ (props changed)
qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
Propchange: qpid/branches/0.32/qpid/cpp/src/qpid/sys/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 24 17:01:28 2015
@@ -0,0 +1,9 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/sys:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/src/qpid/sys:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/qpid/sys:926803,927233
+/qpid/branches/QPID-2519/cpp/src/qpid/sys:1072051-1079078
+/qpid/branches/java-broker-bdb-ha2/qpid/cpp/src/qpid/sys:1576683-1583556
+/qpid/branches/java-network-refactor/qpid/cpp/src/qpid/sys:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/src/qpid/sys:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/src/qpid/sys:1144319-1179855
+/qpid/trunk/qpid/cpp/src/qpid/sys:1661449
Modified: qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp?rev=1662026&r1=1661449&r2=1662026&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp (original)
+++ qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp Tue Feb 24
17:01:28 2015
@@ -44,11 +44,7 @@ namespace qpid {
namespace sys {
long SystemInfo::concurrency() {
-#ifdef _SC_NPROCESSORS_ONLN // Linux specific.
return sysconf(_SC_NPROCESSORS_ONLN);
-#else
- return -1;
-#endif
}
bool SystemInfo::getLocalHostname (Address &address) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
