An Overlay-based
Virtual Network Substrate
SpoVNet

Changeset 10688 for source


Ignore:
Timestamp:
Aug 4, 2012, 3:12:04 AM (7 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.

Location:
source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • source/ariba/utility/addressing

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/bootstrap/modules/bluetoothsdp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/bootstrap/modules/periodicbroadcast

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/ariba/utility/transport

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • source/services/dht/Dht.cpp

    r10653 r10688  
    77
    88#include "Dht.h"
     9#include "messages/DhtMessage.h"
    910#include <boost/date_time/time_clock.hpp>
    1011
  • source/services/dht/Dht.h

    r10653 r10688  
    1212#include "ariba/utility/system/SystemQueue.h"
    1313#include "ariba/utility/logging/Logging.h"
    14 #include "messages/DhtMessage.h"
    1514#include "DhtAnswerInterface.h"
    1615#include <boost/date_time/posix_time/posix_time.hpp>
     
    2524using ariba::utility::SystemEventType;
    2625using ariba::utility::SystemEventListener;
     26
     27// Forward declarations to avoid adding messages/*.h to the public interface
     28class DhtMessage;
    2729
    2830#define MEET_REPUBLISH_INTERVAL 10
     
    135137   
    136138   
    137     virtual void handle_dht_message(const DhtMessage& message, const NodeID& source);
    138 
    139139    /*** SystemEventListener interface ***/
    140140    virtual void handleSystemEvent( const SystemEvent& event );
     
    173173
    174174private:
     175    void handle_dht_message(const DhtMessage& message, const NodeID& source);
     176   
    175177    void answer_dht_request(const std::string& key, const NodeID& source);
    176178    void send_meet_message(const std::string& key, const std::string& value);
Note: See TracChangeset for help on using the changeset viewer.