3535#define HAVE_FAIRMQ_INTERFACE_CHANGESTATE_STRING
3636#endif
3737
38+ #define ENABLE_DDS
39+ #ifdef ENABLE_DDS
3840#include < mutex>
3941#include < condition_variable>
4042#include " KeyValue.h" // DDS
4143#include < boost/asio.hpp> // boost::lock
44+ #endif
4245
4346using std::cout;
4447using std::cerr;
@@ -531,10 +534,12 @@ int sendSocketPropertiesDDS(vector<SocketProperties_t>& sockets)
531534 // ddsmsg << socketkeys[ADDRESS] << "=" << sit->address;
532535 ddsmsg << sit->address ;
533536
537+ #ifdef ENABLE_DDS
534538 dds::CKeyValue ddsKeyValue;
539+ ddsKeyValue.putValue (sit->ddsprop , ddsmsg.str ());
540+ #endif
535541
536542 cout << " DDS putValue: " << sit->ddsprop .c_str () << " " << ddsmsg.str () << endl;
537- ddsKeyValue.putValue (sit->ddsprop , ddsmsg.str ());
538543 }
539544 return 0 ;
540545}
@@ -547,6 +552,7 @@ int readSocketPropertiesDDS(vector<SocketProperties_t>& sockets)
547552 if (sit->method .compare (" connect" )==1 ) continue ;
548553 if (sit->ddscount ==0 ) continue ; // the previously inserted duplicates
549554
555+ #ifdef ENABLE_DDS
550556 dds::CKeyValue ddsKeyValue;
551557 dds::CKeyValue::valuesMap_t values;
552558
@@ -565,13 +571,20 @@ int readSocketPropertiesDDS(vector<SocketProperties_t>& sockets)
565571 }
566572
567573 dds::CKeyValue::valuesMap_t::const_iterator vit = values.begin ();
574+ #endif
575+
568576 vector<SocketProperties_t>::iterator sit2=sit++;
569577 for (; sit2!=sockets.end (); sit2++) {
570578 if (sit2->method .compare (" connect" )==1 ) continue ;
571579 if (sit2->ddsprop .compare (sit->ddsprop )==1 ) continue ;
580+ sit2->address =" placeholder" ;// vit->second;
581+ #ifdef ENABLE_DDS
572582 sit2->address =vit->second ;
573- cout << " DDS getValue:" << sit->ddsprop << " " << vit->second << endl;
583+ #endif
584+ cout << " DDS getValue:" << sit->ddsprop << " " << sit2->address << endl;
585+ #ifdef ENABLE_DDS
574586 vit++;
587+ #endif
575588 }
576589 }
577590 return 0 ;
0 commit comments