From d9526499d6ab53b7d13d1434f748f6f2161c2e0a Mon Sep 17 00:00:00 2001 From: Sebastien Gonzalve Date: Thu, 20 Feb 2014 22:28:03 +0100 Subject: Remove using std::XXX from headers This is a bad practice to have using in headers because it pollutes the namespace of any user of that header. --- skeleton-subsystem/SkeletonSubsystem.cpp | 2 +- skeleton-subsystem/SkeletonSubsystemObject.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'skeleton-subsystem') diff --git a/skeleton-subsystem/SkeletonSubsystem.cpp b/skeleton-subsystem/SkeletonSubsystem.cpp index 3d7f8fb..e3cbcba 100644 --- a/skeleton-subsystem/SkeletonSubsystem.cpp +++ b/skeleton-subsystem/SkeletonSubsystem.cpp @@ -35,7 +35,7 @@ #define base CSubsystem // Implementation -CSkeletonSubsystem::CSkeletonSubsystem(const string& strName) : base(strName) +CSkeletonSubsystem::CSkeletonSubsystem(const std::string& strName) : base(strName) { // Provide mapping keys to upper layer addContextMappingKey("Owner"); diff --git a/skeleton-subsystem/SkeletonSubsystemObject.h b/skeleton-subsystem/SkeletonSubsystemObject.h index e561fc7..f292774 100644 --- a/skeleton-subsystem/SkeletonSubsystemObject.h +++ b/skeleton-subsystem/SkeletonSubsystemObject.h @@ -36,23 +36,23 @@ class CMappingContext; class CSkeletonSubsystemObject : public CFormattedSubsystemObject { public: - CSkeletonSubsystemObject(const string& strMappingValue, CInstanceConfigurableElement* pInstanceConfigurableElement, const CMappingContext& context); + CSkeletonSubsystemObject(const std::string& strMappingValue, CInstanceConfigurableElement* pInstanceConfigurableElement, const CMappingContext& context); protected: // from CSubsystemObject // Sync to/from HW - virtual bool sendToHW(string& strError); - virtual bool receiveFromHW(string& strError); + virtual bool sendToHW(std::string& strError); + virtual bool receiveFromHW(std::string& strError); private: // Sync to/from HW - virtual bool accessHW(bool bReceive, string& strError); + virtual bool accessHW(bool bReceive, std::string& strError); protected: // Scalar parameter size for elementary access uint32_t _uiScalarSize; uint32_t _uiArraySize; - string _strMessage; + std::string _strMessage; // Delayed error about supported parameter types (always false in this example) bool _bWrongElementTypeError; }; -- cgit v1.1