Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make library compatible with C++03 standard so it works also with older compilers #20

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make library compatible with C++03 standard so it works also with older compilers #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions development/include/GXDLMSAssociationLogicalName.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class CGXDLMSAssociationLogicalName : public CGXDLMSObject

std::string m_SecuritySetupReference;

std::vector<std::pair<unsigned char, std::string>> m_UserList;
std::vector<std::pair<unsigned char, std::string> > m_UserList;

std::pair<unsigned char, std::string> m_CurrentUser;

Expand Down Expand Up @@ -120,9 +120,9 @@ class CGXDLMSAssociationLogicalName : public CGXDLMSObject

void SetSecret(CGXByteBuffer& value);

std::vector<std::pair<unsigned char, std::string>>& GetUserList();
std::vector<std::pair<unsigned char, std::string> >& GetUserList();

void SetUserList(std::vector<std::pair<unsigned char, std::string>>& value);
void SetUserList(std::vector<std::pair<unsigned char, std::string> >& value);

std::pair<unsigned char, std::string>& GetCurrentUser();

Expand Down Expand Up @@ -174,4 +174,4 @@ class CGXDLMSAssociationLogicalName : public CGXDLMSObject
int GetValue(CGXDLMSSettings& settings, CGXDLMSValueEventArg& e);
int SetValue(CGXDLMSSettings& settings, CGXDLMSValueEventArg& e);
};
#endif //GXDLMSASSOCIATIONLOGICALNAME_H
#endif //GXDLMSASSOCIATIONLOGICALNAME_H
4 changes: 2 additions & 2 deletions development/src/GXDLMSAssociationLogicalName.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,12 @@ void CGXDLMSAssociationLogicalName::SetSecret(CGXByteBuffer& value)
m_Secret = value;
}

std::vector<std::pair<unsigned char, std::string>>& CGXDLMSAssociationLogicalName::GetUserList()
std::vector<std::pair<unsigned char, std::string> >& CGXDLMSAssociationLogicalName::GetUserList()
{
return m_UserList;
}

void CGXDLMSAssociationLogicalName::SetUserList(std::vector<std::pair<unsigned char, std::string>>& value)
void CGXDLMSAssociationLogicalName::SetUserList(std::vector<std::pair<unsigned char, std::string> >& value)
{
m_UserList = value;
}
Expand Down