You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2007/05/31 20:41:47 UTC
svn commit: r543208 - in
/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf:
net/SocketInputStream.cpp util/Config.h util/concurrent/Mutex.h
util/logging/LogManager.cpp util/logging/LogWriter.cpp
util/logging/Logger.cpp
Author: tabish
Date: Thu May 31 11:41:46 2007
New Revision: 543208
URL: http://svn.apache.org/viewvc?view=rev&rev=543208
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103
Building Decaf lib, remove sub folder from the activemq lib dir, going to top level.
Modified:
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketInputStream.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Config.h
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.h
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp
activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketInputStream.cpp?view=diff&rev=543208&r1=543207&r2=543208
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/net/SocketInputStream.cpp Thu May 31 11:41:46 2007
@@ -162,7 +162,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-std::size_t SocketInputStream::skip( std::size_t num AMQCPP_UNUSED )
+std::size_t SocketInputStream::skip( std::size_t num DECAF_UNUSED )
throw ( io::IOException, lang::exceptions::UnsupportedOperationException ) {
throw lang::exceptions::UnsupportedOperationException(
__FILE__, __LINE__,
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Config.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Config.h?view=diff&rev=543208&r1=543207&r2=543208
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Config.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/Config.h Thu May 31 11:41:46 2007
@@ -14,44 +14,44 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef ACTIVEMQ_UTIL_CONFIG_H_
-#define ACTIVEMQ_UTIL_CONFIG_H_
+#ifndef _DECAF_UTIL_CONFIG_H_
+#define _DECAF_UTIL_CONFIG_H_
-#ifdef AMQCPP_DLL
-#ifdef AMQCPP_EXPORTS
-#define AMQCPP_API __declspec(dllexport)
+#ifdef DECAF_DLL
+#ifdef DECAF_EXPORTS
+#define DECAF_API __declspec(dllexport)
#else
-#define AMQCPP_API __declspec(dllimport)
+#define DECAF_API __declspec(dllimport)
#endif
#else
-#define AMQCPP_API
+#define DECAF_API
#endif
//
-// The purpose of this header is to try to detect the supported headers
+// The purpose of this header is to try to detect the supported headers
// of the platform when the ./configure script is not being used to generate
// the config.h file.
//
-#if defined(HAVE_CONFIG_H)
+#if defined(HAVE_CONFIG_H)
- // config.h is generated by the ./configure script and it only
- // used by unix like systems (including cygwin)
- #include <config.h>
+ // config.h is generated by the ./configure script and it only
+ // used by unix like systems (including cygwin)
+ #include <config.h>
#else /* !defined(HAVE_CONFIG_H) */
- // Not using ./configure script and make system.. chances are your using the native build tools
- // of Windows or OS X to do this build
-
- #if defined(_WIN32)
+ // Not using ./configure script and make system.. chances are your using the native build tools
+ // of Windows or OS X to do this build
+
+ #if defined(_WIN32)
#ifndef HAVE_OBJBASE_H
- #define HAVE_OBJBASE_H
+ #define HAVE_OBJBASE_H
#endif
#ifndef HAVE_RPCDCE_H
- #define HAVE_RPCDCE_H
+ #define HAVE_RPCDCE_H
#endif
#ifndef HAVE_WINSOCK2_H
- #define HAVE_WINSOCK2_H
+ #define HAVE_WINSOCK2_H
#endif
#ifndef HAVE_STRUCT_ADDRINFO
#define HAVE_STRUCT_ADDRINFO
@@ -65,9 +65,9 @@
#ifndef HAVE_WINDOWS_H
#define HAVE_WINDOWS_H
#endif
- #else
+ #else
#ifndef HAVE_UUID_UUID_H
- #define HAVE_UUID_UUID_H
+ #define HAVE_UUID_UUID_H
#endif
#ifndef HAVE_UUID_T
#define HAVE_UUID_T
@@ -75,16 +75,16 @@
#ifndef HAVE_PTHREAD_H
#define HAVE_PTHREAD_H
#endif
- #endif
+ #endif
#endif /* !defined(HAVE_CONFIG_H) */
// Macro to mark attributes as unused
#ifdef __GNUC__
- #define AMQCPP_UNUSED __attribute__ ((__unused__))
+ #define DECAF_UNUSED __attribute__ ((__unused__))
#else
- #define AMQCPP_UNUSED
+ #define DECAF_UNUSED
#endif
-#endif /*ACTIVEMQ_UTIL_CONFIG_H_*/
+#endif /*_DECAF_UTIL_CONFIG_H_*/
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.h?view=diff&rev=543208&r1=543207&r2=543208
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.h (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/concurrent/Mutex.h Thu May 31 11:41:46 2007
@@ -54,7 +54,7 @@
* and will be successful.
* @see pthread_mutex_t
*/
- class AMQCPP_API Mutex : public Synchronizable
+ class DECAF_API Mutex : public Synchronizable
{
private: // Data
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp?view=diff&rev=543208&r1=543207&r2=543208
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogManager.cpp Thu May 31 11:41:46 2007
@@ -65,12 +65,12 @@
}
////////////////////////////////////////////////////////////////////////////////
-Logger* LogManager::getLogger( const std::string& name AMQCPP_UNUSED ) {
+Logger* LogManager::getLogger( const std::string& name DECAF_UNUSED ) {
return NULL;
}
////////////////////////////////////////////////////////////////////////////////
-int LogManager::getLoggerNames( const std::vector<std::string>& names AMQCPP_UNUSED ) {
+int LogManager::getLoggerNames( const std::vector<std::string>& names DECAF_UNUSED ) {
return 0;
}
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp?view=diff&rev=543208&r1=543207&r2=543208
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/LogWriter.cpp Thu May 31 11:41:46 2007
@@ -43,8 +43,8 @@
}
////////////////////////////////////////////////////////////////////////////////
-void LogWriter::log(const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED,
+void LogWriter::log(const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED,
const std::string& prefix,
const std::string& message)
{
Modified: activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp?view=diff&rev=543208&r1=543207&r2=543208
==============================================================================
--- activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp (original)
+++ activemq/activemq-cpp/trunk/src/decaf/src/main/decaf/util/logging/Logger.cpp Thu May 31 11:41:46 2007
@@ -27,8 +27,8 @@
using namespace decaf::util::logging;
////////////////////////////////////////////////////////////////////////////////
-Logger::Logger( const std::string& name AMQCPP_UNUSED,
- Logger* parent AMQCPP_UNUSED ) {
+Logger::Logger( const std::string& name DECAF_UNUSED,
+ Logger* parent DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
@@ -65,87 +65,87 @@
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::setFilter( Filter* filter AMQCPP_UNUSED ){
+void Logger::setFilter( Filter* filter DECAF_UNUSED ){
}
////////////////////////////////////////////////////////////////////////////////
-bool Logger::isLoggable( Level level AMQCPP_UNUSED ) const{
+bool Logger::isLoggable( Level level DECAF_UNUSED ) const{
return false;
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::entry( const std::string& blockName AMQCPP_UNUSED,
- const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED ) {
+void Logger::entry( const std::string& blockName DECAF_UNUSED,
+ const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::exit(const std::string& blockName AMQCPP_UNUSED,
- const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED) {
+void Logger::exit(const std::string& blockName DECAF_UNUSED,
+ const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::debug( const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED,
- const std::string fnctionName AMQCPP_UNUSED,
- const std::string& message AMQCPP_UNUSED ) {
+void Logger::debug( const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED,
+ const std::string fnctionName DECAF_UNUSED,
+ const std::string& message DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::info( const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED,
- const std::string fnctionName AMQCPP_UNUSED,
- const std::string& message AMQCPP_UNUSED ) {
+void Logger::info( const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED,
+ const std::string fnctionName DECAF_UNUSED,
+ const std::string& message DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::error( const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED,
- const std::string fnctionName AMQCPP_UNUSED,
- const std::string& message AMQCPP_UNUSED ) {
+void Logger::error( const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED,
+ const std::string fnctionName DECAF_UNUSED,
+ const std::string& message DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::warn( const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED,
- const std::string fnctionName AMQCPP_UNUSED,
- const std::string& message AMQCPP_UNUSED ) {
+void Logger::warn( const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED,
+ const std::string fnctionName DECAF_UNUSED,
+ const std::string& message DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::fatal( const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED,
- const std::string fnctionName AMQCPP_UNUSED,
- const std::string& message AMQCPP_UNUSED ) {
+void Logger::fatal( const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED,
+ const std::string fnctionName DECAF_UNUSED,
+ const std::string& message DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::log( Level level AMQCPP_UNUSED,
- const std::string& message AMQCPP_UNUSED ) {
+void Logger::log( Level level DECAF_UNUSED,
+ const std::string& message DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::log( Level level AMQCPP_UNUSED,
- const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED,
- const std::string& message AMQCPP_UNUSED,
- lang::Exception& ex AMQCPP_UNUSED ) {
+void Logger::log( Level level DECAF_UNUSED,
+ const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED,
+ const std::string& message DECAF_UNUSED,
+ lang::Exception& ex DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::log( Level level AMQCPP_UNUSED,
- const std::string& file AMQCPP_UNUSED,
- const int line AMQCPP_UNUSED,
- const std::string& message AMQCPP_UNUSED, ... ) {
+void Logger::log( Level level DECAF_UNUSED,
+ const std::string& file DECAF_UNUSED,
+ const int line DECAF_UNUSED,
+ const std::string& message DECAF_UNUSED, ... ) {
}
////////////////////////////////////////////////////////////////////////////////
-void Logger::log( LogRecord& record AMQCPP_UNUSED ) {
+void Logger::log( LogRecord& record DECAF_UNUSED ) {
}
////////////////////////////////////////////////////////////////////////////////
-Logger* Logger::getLogger( const std::string& name AMQCPP_UNUSED ) {
+Logger* Logger::getLogger( const std::string& name DECAF_UNUSED ) {
return NULL;
}