Avoid name clash with some GetObject() windows definition

master
U-INFINEON\jahnst 3 years ago
parent 10351217c4
commit 539bf8b726

@ -222,7 +222,7 @@ void Configuration::LoadConfig(std::string filename) {
posctl.LockMutex();
for (i = 0; i < 2; i++) {
if (jp.GetObject("posctl_axis"+to_string(i), &jaxis)) {
if (jp.GetObjectJson("posctl_axis"+to_string(i), &jaxis)) {
jaxis.GetValueDouble("min", &amin);
jaxis.GetValueDouble("max", &amax);
jaxis.GetValueDouble("kp", &akp);

@ -232,7 +232,7 @@ int JSONParse::GetValueInt64(string varname, int64_t *dest) {
};
int JSONParse::GetObject(string varname, JSONParse *dest) {
int JSONParse::GetObjectJson(string varname, JSONParse *dest) {
list<JSONElement>::iterator iter;
if (dest == NULL) return 0;

@ -56,7 +56,7 @@ public:
int GetValueInt(string varname, int *dest);
int GetValueDouble(string varname, double *dest);
int GetValueInt64(string varname, int64_t *dest);
int GetObject(string varname, JSONParse *dest);
int GetObjectJson(string varname, JSONParse *dest);
int GetIdx(string src, int idx, string *dest);
int GetValueIdx(string varname, int idx, string *dest);

Loading…
Cancel
Save