X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fenums.py;h=9eddd1ad9631fe61344b7ec13068bf5cc0adb29c;hb=b3fccc851b1bbeb6955ddec9007cea72a3e9e3fd;hp=380faf91d838dc68195fe623d73722e7b38b10d2;hpb=33c84e81975c75b73002b038a0076f384ca13d63;p=libsigrok.git

diff --git a/bindings/cxx/enums.py b/bindings/cxx/enums.py
index 380faf91..9eddd1ad 100644
--- a/bindings/cxx/enums.py
+++ b/bindings/cxx/enums.py
@@ -82,7 +82,7 @@ public:
 # Template for beginning of private members.
 header_private_template = """
 private:
-    static const std::map<enum {enumname}, const {classname} *> values;
+    static const std::map<enum {enumname}, const {classname} *> _values;
     {classname}(enum {enumname} id, const char name[]);
 """
 
@@ -95,7 +95,10 @@ code_template = """
 
 const {classname} *{classname}::get(int id)
 {{
-    return {classname}::values.at(static_cast<{enumname}>(id));
+    if (_values.find(static_cast<{enumname}>(id)) == _values.end())
+        throw Error(SR_ERR_ARG);
+
+    return {classname}::_values.at(static_cast<{enumname}>(id));
 }}
 """
 
@@ -153,7 +156,7 @@ for enum, (classname, classbrief) in classes.items():
             classname, classname, trimmed_name, classname, trimmed_name)
 
     # Define map of enum values to constants
-    print >> code, 'const std::map<enum %s, const %s *> %s::values = {' % (
+    print >> code, 'const std::map<enum %s, const %s *> %s::_values = {' % (
         enum_name, classname, classname)
     for name, trimmed_name in zip(member_names, trimmed_names):
         print >> code, '\t{%s, %s::%s},' % (name, classname, trimmed_name)