odb codegen: adds support for C++ enum classes

Signed-off-by: Felipe Garay <[email protected]>
fgaray · Dec 15, 2023 · c52e2b9 · c52e2b9
1 parent 41f53d4
commit c52e2b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/odb/include/odb/db.h b/src/odb/include/odb/db.h
@@ -7634,7 +7634,7 @@ class dbScanChain : public dbObject
 class dbScanInst : public dbObject
 {
  public:
-  enum SCAN_INST_TYPE
+  enum class SCAN_INST_TYPE
   {
     OneBit,
     ShiftRegister,

diff --git a/src/odb/src/codeGenerator/schema/scan/dbScanInst.json b/src/odb/src/codeGenerator/schema/scan/dbScanInst.json
@@ -22,6 +22,7 @@
     {
       "name": "SCAN_INST_TYPE",
       "public": true,
+      "class": true,
       "values": [
         "OneBit",
         "ShiftRegister",

diff --git a/src/odb/src/codeGenerator/templates/db.h b/src/odb/src/codeGenerator/templates/db.h
@@ -22,7 +22,11 @@ class {{klass.name}} : public dbObject
   {% endfor %}
   {% for _enum in klass.enums %}
     {% if _enum.public %}
-    enum {{ _enum.name }}{% if "type" in _enum %} :{{ _enum.type }}{% endif %}
+      {% if _enum.class %}
+        enum class {{ _enum.name }}{% if "type" in _enum %} :{{ _enum.type }}{% endif %}
+      {% else %}
+        enum {{ _enum.name }}{% if "type" in _enum %} :{{ _enum.type }}{% endif %}
+      {% endif %}
     {
       {% for value in _enum["values"]%}
       {% if not loop.first %},{%endif%}{{value}}