[nostalgia] Merge branch 'master' of github.com:gtalent/nostalgia

2019-06-14 18:12:45 -05:00
parent 829357faaf
commit 0c05d298d0
3 changed files with 5 additions and 7 deletions
@@ -66,7 +66,7 @@ ox::Error JsonReader::field(QString fieldName, T *dest) {
 	} else {
 		return JSON_ERR_FIELD_MISSING;
 	}
-};
+}

 template<typename T>
 ox::Error JsonReader::field(QString fieldName, QVector<T> *dest) {
@@ -81,7 +81,7 @@ ox::Error JsonReader::field(QString fieldName, QVector<T> *dest) {
 		err |= JSON_ERR_FIELD_MISSING;
 	}
 	return err;
-};
+}

 template<typename T>
 ox::Error JsonReader::field(QJsonValueRef src, T *dest) {