bin: add missing std namespace prefixes in deployer sources

This is a regression from #74, which removed the `using namespace std` directive, but was picked from a branch were #57 was already applied. The latter moved the tlsf log output from the individual deployers to a centralized class in `deployer-funcs.cpp` and therefore did not require the using namespace directive anymore. Signed-off-by: Johannes Meyer <[email protected]>
orocos-toolchain · Apr 17, 2019 · 86db029 · 86db029
1 parent 6f5bb25
commit 86db029
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/bin/cdeployer.cpp b/bin/cdeployer.cpp
@@ -171,7 +171,8 @@ int main(int argc, char** argv)
                      iter!=scriptFiles.end() && result;
                      ++iter)
                 {
-                    if ( (*iter).rfind(".xml",string::npos) == (*iter).length() - 4 || (*iter).rfind(".cpf",string::npos) == (*iter).length() - 4) {
+                    if ( (*iter).rfind(".xml", std::string::npos) == (*iter).length() - 4 ||
+                         (*iter).rfind(".cpf", std::string::npos) == (*iter).length() - 4) {
                         if ( deploymentOnlyChecked ) {
                             bool loadOk         = true;
                             bool configureOk    = true;

diff --git a/bin/deployer-corba.cpp b/bin/deployer-corba.cpp
@@ -38,8 +38,7 @@
 #include <deployment/CorbaDeploymentComponent.hpp>
 #include <rtt/transports/corba/TaskContextServer.hpp>
 #include <iostream>
-#include <unistd.h>
-#include <stdio.h>
+#include <string>
 #include "deployer-funcs.hpp"
 
 #include <rtt/transports/corba/corba.h>
@@ -181,7 +180,8 @@ int main(int argc, char** argv)
                 {
                     if ( !(*iter).empty() )
                     {
-                        if ( (*iter).rfind(".xml",string::npos) == (*iter).length() - 4 || (*iter).rfind(".cpf",string::npos) == (*iter).length() - 4) {
+                        if ( (*iter).rfind(".xml", std::string::npos) == (*iter).length() - 4 ||
+                             (*iter).rfind(".cpf", std::string::npos) == (*iter).length() - 4) {
                             if ( deploymentOnlyChecked ) {
                                 if (!dc.loadComponents( (*iter) )) {
                                     result = false;

diff --git a/bin/deployer.cpp b/bin/deployer.cpp
@@ -44,8 +44,6 @@
 #include <deployment/DeploymentComponent.hpp>
 #include <iostream>
 #include <string>
-#include <unistd.h>
-#include <stdio.h>
 #include "deployer-funcs.hpp"
 
 #ifdef  ORO_BUILD_LOGGING