aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-01-20 13:58:22 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-01-21 17:13:31 +0000
commit6df386f06ba50d6936755514f163cc7ea4d46033 (patch)
tree303a03a99a59d53eb4a95ca5dc6c218a78c81f69
parent980e92556c5167dec084e972e2690d2b0034b4d5 (diff)
Fix namespace issue that fails on newer g++icefish_8.99.5icefish/8.99.58.99.5
The explicit reference to the std::__cxx11 namespace in high.hpp seems no longer required and triggers an error on newer versions of g++, remove it. Bug-AGL: SPEC-2932 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ib49e7faebbad246aa777129c401981a58352fec4
-rw-r--r--high-can-binding/high.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/high-can-binding/high.hpp b/high-can-binding/high.hpp
index de3a471..4de0119 100644
--- a/high-can-binding/high.hpp
+++ b/high-can-binding/high.hpp
@@ -54,5 +54,5 @@ private:
std::map<std::string, std::set<std::string>> lowMessagesToObjects;
std::set<int> timers;
std::string generateId() const;
- json_object *generateJson(const std::string &messageObject, std::vector<std::__cxx11::string> *fields = NULL);
+ json_object *generateJson(const std::string &messageObject, std::vector<std::string> *fields = NULL);
};