summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Rocard <kevin.rocard@intel.com>2015-02-06 11:24:29 +0100
committerKevin Rocard <kevin.rocard@intel.com>2015-02-06 11:31:28 +0100
commit67c8584aa02c92135f84785fa446f2d0acab3224 (patch)
tree0608276e0c8e4d273bc42068419cf4fac4ef3273
parentf39078a6c340431a749ded1f69deb6c646de531c (diff)
downloadexternal_parameter-framework-67c8584aa02c92135f84785fa446f2d0acab3224.zip
external_parameter-framework-67c8584aa02c92135f84785fa446f2d0acab3224.tar.gz
external_parameter-framework-67c8584aa02c92135f84785fa446f2d0acab3224.tar.bz2
Missing std prefix in skeleton plugin
The skeleton plugin is not compiled when compiling the root pfw project. As a result, when `using namespaces` was removed from the pfw headers the skeleton plugin was left unchecked and unfortunately broken. Fix the missing `std::` by adding them where needed or inserting a `using std::string`. Signed-off-by: Kevin Rocard <kevin.rocard@intel.com>
-rw-r--r--skeleton-subsystem/SkeletonSubsystem.h2
-rw-r--r--skeleton-subsystem/SkeletonSubsystemObject.cpp6
2 files changed, 5 insertions, 3 deletions
diff --git a/skeleton-subsystem/SkeletonSubsystem.h b/skeleton-subsystem/SkeletonSubsystem.h
index 6f1af19..26cd659 100644
--- a/skeleton-subsystem/SkeletonSubsystem.h
+++ b/skeleton-subsystem/SkeletonSubsystem.h
@@ -34,7 +34,7 @@
class CSkeletonSubsystem : public CSubsystem
{
public:
- CSkeletonSubsystem(const string& strName);
+ CSkeletonSubsystem(const std::string& strName);
};
diff --git a/skeleton-subsystem/SkeletonSubsystemObject.cpp b/skeleton-subsystem/SkeletonSubsystemObject.cpp
index 5c251db..5ecded9 100644
--- a/skeleton-subsystem/SkeletonSubsystemObject.cpp
+++ b/skeleton-subsystem/SkeletonSubsystemObject.cpp
@@ -43,6 +43,8 @@
#define base CFormattedSubsystemObject
+using std::string;
+
CSkeletonSubsystemObject::CSkeletonSubsystemObject(
const string& strMappingValue,
CInstanceConfigurableElement* pInstanceConfigurableElement,
@@ -105,7 +107,7 @@ bool CSkeletonSubsystemObject::sendToHW(string& strError)
blackboardRead(pvValue, _uiScalarSize);
// Send here the value
- cout << "Sending to HW: " << _strMessage << endl;
+ std::cout << "Sending to HW: " << _strMessage << std::endl;
}
return true;
@@ -122,7 +124,7 @@ bool CSkeletonSubsystemObject::receiveFromHW(string& strError)
for (uiIndex = 0 ; uiIndex < _uiArraySize ; uiIndex++) {
// Retreive here the value
- cout << "Retreive from HW: " << _strMessage << endl;
+ std::cout << "Retreive from HW: " << _strMessage << std::endl;
// Write Value in Blackboard
blackboardWrite(pvValue, _uiScalarSize);