Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Commit b64ad9c

Browse files
committed
Merge branch 'missing_std_in_skeleton' of https://github.com/krocard/parameter-framework into krocard-missing_std_in_skeleton
2 parents 42bd9cf + 67c8584 commit b64ad9c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

skeleton-subsystem/SkeletonSubsystem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
class CSkeletonSubsystem : public CSubsystem
3535
{
3636
public:
37-
CSkeletonSubsystem(const string& strName);
37+
CSkeletonSubsystem(const std::string& strName);
3838

3939
};
4040

skeleton-subsystem/SkeletonSubsystemObject.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343

4444
#define base CFormattedSubsystemObject
4545

46+
using std::string;
47+
4648
CSkeletonSubsystemObject::CSkeletonSubsystemObject(
4749
const string& strMappingValue,
4850
CInstanceConfigurableElement* pInstanceConfigurableElement,
@@ -105,7 +107,7 @@ bool CSkeletonSubsystemObject::sendToHW(string& strError)
105107
blackboardRead(pvValue, _uiScalarSize);
106108

107109
// Send here the value
108-
cout << "Sending to HW: " << _strMessage << endl;
110+
std::cout << "Sending to HW: " << _strMessage << std::endl;
109111
}
110112

111113
return true;
@@ -122,7 +124,7 @@ bool CSkeletonSubsystemObject::receiveFromHW(string& strError)
122124
for (uiIndex = 0 ; uiIndex < _uiArraySize ; uiIndex++) {
123125

124126
// Retreive here the value
125-
cout << "Retreive from HW: " << _strMessage << endl;
127+
std::cout << "Retreive from HW: " << _strMessage << std::endl;
126128

127129
// Write Value in Blackboard
128130
blackboardWrite(pvValue, _uiScalarSize);

0 commit comments

Comments
 (0)