Changeset 10700 for source/ariba/utility/transport

Timestamp:

Aug 22, 2012, 2:09:00 PM (12 years ago)

Author:

Michael Tänzer

Message:

Merge CMake branch into trunk

Location:

source

Files:

• . (modified) (1 prop)
• ariba (modified) (1 prop)
• ariba/utility (modified) (1 prop)
• ariba/utility/transport (modified) (1 prop)
• ariba/utility/transport/CMakeLists.txt (added)
• ariba/utility/transport/asio/CMakeLists.txt (added)
• ariba/utility/transport/messages/CMakeLists.txt (added)
• ariba/utility/transport/messages/shared_buffer.hpp (modified) (1 diff)
• ariba/utility/transport/rfcomm/CMakeLists.txt (added)
• ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp (modified) (1 diff)
• ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp (modified) (2 diffs)
• ariba/utility/transport/tcpip/CMakeLists.txt (added)
• ariba/utility/transport/transport_peer.cpp (modified) (1 diff)
• ariba/utility/transport/transport_peer.hpp (modified) (2 diffs)

source/ariba/utility/transport/messages/shared_buffer.hpp

@@ -11 +11 @@
 #include <boost/shared_ptr.hpp>
 
+#include "ariba/config.h"
 #ifdef DEBUG
 #include <boost/thread/mutex.hpp>

source/ariba/utility/transport/rfcomm/bluetooth_endpoint.hpp

@@ -192 +192 @@
 }}} // namespace boost::asio::bluetooth
 
+#endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */
 #endif /* HAVE_LIBBLUETOOTH */
-#endif /* BOOST_ASIO_BLUETOOTH_BLUETOOTH_ENDPOINT_HPP__ */

source/ariba/utility/transport/rfcomm/bluetooth_rfcomm.hpp

@@ +1 @@
+#include "ariba/config.h"
+
+#ifdef HAVE_LIBBLUETOOTH
+
 #ifndef BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
 #define BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__
@@ -53 +57 @@
 
 #endif /* BOOST_ASIO_BLUETOOTH_RFCOMM_HPP__ */
+#endif /* HAVE_LIBBLUETOOTH */

source/ariba/utility/transport/transport_peer.cpp

@@ -3 +3 @@
 #include "transport_peer.hpp"
 #include "transport.hpp"
-#include "ariba/utility/logging/Logging.h"
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/error.hpp>

source/ariba/utility/transport/transport_peer.hpp

@@ -3 +3 @@
 
 #include "ariba/config.h"
+#include "ariba/utility/logging/Logging.h"
 #include "transport_protocol.hpp"
 #include "ariba/utility/addressing/endpoint_set.hpp"
@@ -29 +30 @@
 /// protocols and can send messages to an entire set of endpoints
 class transport_peer : public transport_protocol {
+        use_logging_h(transport_peer);
 public:
         transport_peer( endpoint_set& local_set );