From 625e0d59eecfd69c63aa6f8523f5b880b78d2181 Mon Sep 17 00:00:00 2001
From: Peter Kaiser <peter.kaiser@kit.edu>
Date: Tue, 10 Nov 2015 06:36:16 +0100
Subject: [PATCH] BusInspectionUnit: Removed dynamic memory allocations
---
.../components/units/BusInspectionUnit.cpp | 30 ++++++-------------
1 file changed, 9 insertions(+), 21 deletions(-)
diff --git a/source/RobotAPI/components/units/BusInspectionUnit.cpp b/source/RobotAPI/components/units/BusInspectionUnit.cpp
index 6bf047905..a54de39a5 100644
--- a/source/RobotAPI/components/units/BusInspectionUnit.cpp
+++ b/source/RobotAPI/components/units/BusInspectionUnit.cpp
@@ -27,10 +27,8 @@
#include <vector>
#include <string>
-using namespace std;
using namespace armarx;
-
void BusInspectionUnit::onInitComponent()
{
this->onInitBusInspectionUnit();
@@ -39,16 +37,8 @@ void BusInspectionUnit::onInitComponent()
void BusInspectionUnit::onConnectComponent()
{
-
- ARMARX_INFO << flush;
-
- // TODO: muss das hier gleich sein wie der Channel der Kinematicunit?!?!
- //std::string busInspectionChannel = "busInspection";
-
busInspectionValuePrx = getTopic<BusInspectionInterfacePrx>("HardwareValues");
- ARMARX_INFO << "subscribing topic: " << "HardwareValues" << flush;
-
-
+ ARMARX_INFO << "subscribing topic: " << "HardwareValues";
this->onConnectBusInspectionUnit();
}
@@ -58,24 +48,26 @@ void BusInspectionUnit::onExitComponent()
this->onExitBusInspectionUnit();
}
-
BusNames BusInspectionUnit::getConfiguredBusses(const Ice::Current& c)
{
- return *(new vector<string>());
+ std::vector<std::string> res;
+ return res;
}
BusInformation BusInspectionUnit::getBusInformation(const std::string& bus, const Ice::Current& c)
{
- return *(new BusInformation);
-
+ BusInformation res;
+ return res;
}
DeviceNames BusInspectionUnit::getDevicesOnBus(const std::string& bus, const Ice::Current& c)
{
- return *(new vector<string>());
+ std::vector<std::string> res;
+ return res;
}
DeviceInformation BusInspectionUnit::getDeviceInformation(const std::string& device, const Ice::Current& c)
{
- return *(new DeviceInformation);
+ DeviceInformation res;
+ return res;
}
Ice::Int BusInspectionUnit::performDeviceOperation(BasicOperation operation, Ice::Int device, const Ice::Current& c)
@@ -93,19 +85,15 @@ bool BusInspectionUnit::isInRealTimeMode(const Ice::Current& c)
return false;
}
-
std::string BusInspectionUnit::sendCommand(const std::string& command, Ice::Int device, const Ice::Current& c)
{
return "";
}
-
PropertyDefinitionsPtr BusInspectionUnit::createPropertyDefinitions()
{
return PropertyDefinitionsPtr(new BusInspectionUnitPropertyDefinitions(
getConfigIdentifier()));
}
-
-
#endif
--
GitLab