Skip to content

Commit d9aa594

Browse files
committed
Refs #21129: Remove unnecessary namespaces
Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
1 parent db23697 commit d9aa594

5 files changed

Lines changed: 10 additions & 20 deletions

File tree

examples/HelloWorldExampleDS/HelloWorldServer.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
2828
#include <fastdds/utils/IPLocator.h>
2929

30-
using namespace eprosima::fastdds;
31-
using namespace eprosima::fastdds::rtps;
32-
3330
using namespace eprosima::fastdds;
3431
using namespace eprosima::fastdds::dds;
3532
using namespace eprosima::fastdds::rtps;
@@ -43,7 +40,7 @@ bool HelloWorldServer::init(
4340
Locator server_address)
4441
{
4542

46-
eprosima::fastdds::dds::DomainParticipantQos participant_qos = eprosima::fastdds::dds::PARTICIPANT_QOS_DEFAULT;
43+
DomainParticipantQos participant_qos = PARTICIPANT_QOS_DEFAULT;
4744

4845
participant_qos.wire_protocol().builtin.discovery_config.discoveryProtocol = DiscoveryProtocol_t::SERVER;
4946
std::istringstream iss("44.49.53.43.53.45.52.56.45.52.5F.31");

include/DiscoveryServerManager.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
#include "DiscoveryItem.h"
3434

3535
using namespace eprosima::fastdds;
36-
using namespace eprosima::fastdds;
37-
using namespace eprosima::fastdds::rtps;
3836
using namespace eprosima::fastdds::rtps;
3937
using namespace eprosima::fastdds::dds;
4038

@@ -87,7 +85,7 @@ class DelayedParticipantCreation;
8785
class DelayedParticipantDestruction;
8886

8987
class DiscoveryServerManager
90-
: public eprosima::fastdds::dds::DomainParticipantListener // receive discovery callback information and
88+
: public DomainParticipantListener // receive discovery callback information and
9189
// subscriber lifeliness information
9290

9391
{

src/DiscoveryServerManager.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
#include "log/DSLog.h"
3131

3232
using namespace eprosima::fastdds;
33-
using namespace eprosima::fastdds;
34-
using namespace eprosima::fastdds::rtps;
3533
using namespace eprosima::fastdds::rtps;
3634
using namespace eprosima::discovery_server;
3735

src/LateJoiner.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
#include "DiscoveryServerManager.h"
2121

2222
using namespace eprosima::fastdds;
23-
using namespace eprosima::discovery_server;
24-
// New API
2523
using namespace eprosima::fastdds::dds;
24+
using namespace eprosima::discovery_server;
2625

2726
// delayed creation of a new participant
2827
void DelayedParticipantCreation::operator ()(
@@ -31,8 +30,8 @@ void DelayedParticipantCreation::operator ()(
3130

3231
DomainParticipant* p = DomainParticipantFactory::get_instance()->create_participant(0, qos, &manager);
3332

34-
fastdds::dds::Publisher* publisher_ = p->create_publisher(PUBLISHER_QOS_DEFAULT);
35-
fastdds::dds::Subscriber* subscriber_ = p->create_subscriber(SUBSCRIBER_QOS_DEFAULT);
33+
Publisher* publisher_ = p->create_publisher(PUBLISHER_QOS_DEFAULT);
34+
Subscriber* subscriber_ = p->create_subscriber(SUBSCRIBER_QOS_DEFAULT);
3635

3736
ParticipantCreatedEntityInfo info;
3837

@@ -101,13 +100,13 @@ const LateJoinerDataTraits<DataWriter>::removeEndpoint LateJoinerDataTraits<Data
101100

102101
/*static*/
103102
DataWriter* LateJoinerDataTraits<DataWriter>::createEndpoint(
104-
fastdds::dds::DomainEntity* publisher,
103+
DomainEntity* publisher,
105104
Topic* topic,
106105
const std::string& profile_name,
107106
void*)
108107
{
109108

110-
fastdds::dds::Publisher* pub = static_cast<fastdds::dds::Publisher*>(publisher);
109+
Publisher* pub = static_cast<Publisher*>(publisher);
111110

112111
if (profile_name.empty())
113112
{
@@ -129,12 +128,12 @@ const LateJoinerDataTraits<DataReader>::removeEndpoint LateJoinerDataTraits<Data
129128

130129
/*static*/
131130
DataReader* LateJoinerDataTraits<DataReader>::createEndpoint(
132-
fastdds::dds::DomainEntity* subscriber,
131+
DomainEntity* subscriber,
133132
Topic* topic,
134133
const std::string& profile_name,
135-
fastdds::dds::SubscriberListener* list /* = nullptr*/)
134+
SubscriberListener* list /* = nullptr*/)
136135
{
137-
fastdds::dds::Subscriber* sub = static_cast<fastdds::dds::Subscriber*>(subscriber);
136+
Subscriber* sub = static_cast<Subscriber*>(subscriber);
138137

139138
if (profile_name.empty())
140139
{

src/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525

2626
using namespace eprosima;
2727
using namespace fastdds;
28-
using namespace fastdds;
29-
using namespace fastdds::rtps;
3028
using namespace fastdds::rtps;
3129
using namespace discovery_server;
3230

0 commit comments

Comments
 (0)