Changeset 10688

Timestamp:

Aug 4, 2012, 3:12:04 AM (12 years ago)

Author:

Michael Tänzer

Message:

Merge fix into trunk: DHT: Add a forward declaration for DhtMessage so the
messages/DhtMessage.h can be kept from the public interface.
Also make handle_dht_message private and non-virtual.

Files:

• (root) (modified) (1 prop)
• source/ariba/utility/addressing (modified) (1 prop)
• source/ariba/utility/bootstrap/modules/bluetoothsdp (modified) (1 prop)
• source/ariba/utility/bootstrap/modules/periodicbroadcast (modified) (1 prop)
• source/ariba/utility/transport (modified) (1 prop)
• source/services/dht/Dht.cpp (modified) (1 diff)
• source/services/dht/Dht.h (modified) (4 diffs)

source/services/dht/Dht.cpp

@@ -7 +7 @@
 
 #include "Dht.h"
+#include "messages/DhtMessage.h"
 #include <boost/date_time/time_clock.hpp>
 

source/services/dht/Dht.h

@@ -12 +12 @@
 #include "ariba/utility/system/SystemQueue.h"
 #include "ariba/utility/logging/Logging.h"
-#include "messages/DhtMessage.h"
 #include "DhtAnswerInterface.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -25 +24 @@
 using ariba::utility::SystemEventType;
 using ariba::utility::SystemEventListener;
+
+// Forward declarations to avoid adding messages/*.h to the public interface
+class DhtMessage;
 
 #define MEET_REPUBLISH_INTERVAL 10
@@ -135 +137 @@
     
     
-    virtual void handle_dht_message(const DhtMessage& message, const NodeID& source);
-
     /*** SystemEventListener interface ***/
     virtual void handleSystemEvent( const SystemEvent& event );
@@ -173 +173 @@
 
 private:
+    void handle_dht_message(const DhtMessage& message, const NodeID& source);
+    
     void answer_dht_request(const std::string& key, const NodeID& source);
     void send_meet_message(const std::string& key, const std::string& value);