Merge branch 'missing_std_in_skeleton' of https://github.com/krocard/parameter-framework into krocard-missing_std_in_skeleton
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 @@
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 @@
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);