diff options
| author | David Wagner <david.wagner@intel.com> | 2015-02-13 18:56:15 +0100 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2015-02-13 18:56:15 +0100 |
| commit | 84709c9e1d35e54e51ece60c41ad640412b7bfca (patch) | |
| tree | 3067293ac083b572588838218b4025b07757ee8d | |
| parent | 42bd9cfaa9efed0f5cebf418073e2a3379172734 (diff) | |
| parent | e394de177d6dd6839a7fb883c21b9fc36884d3ff (diff) | |
| download | external_parameter-framework-84709c9e1d35e54e51ece60c41ad640412b7bfca.zip external_parameter-framework-84709c9e1d35e54e51ece60c41ad640412b7bfca.tar.gz external_parameter-framework-84709c9e1d35e54e51ece60c41ad640412b7bfca.tar.bz2 | |
Merge pull request #47 from dawagner/krocard-missing_std_in_skeleton
missing std in skeleton
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | skeleton-subsystem/SkeletonSubsystem.h | 2 | ||||
| -rw-r--r-- | skeleton-subsystem/SkeletonSubsystemObject.cpp | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 12f177a..d5e8b75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,11 @@ before_install: - sudo apt-get install -y swig # how to build -script: cmake . && make -j && sudo make install && make test +script: + - cmake . && make -j && sudo make install + - make test + - cd skeleton-subsystem + - cmake . && make && sudo make install notifications: email: 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); |