diff --git a/CMakeLists.txt b/CMakeLists.txt index db5ea055..698d3583 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_policy(SET CMP0017 NEW) # need include() with .cmake project(pip) set(pip_MAJOR 2) set(pip_MINOR 26) -set(pip_REVISION 0) +set(pip_REVISION 1) set(pip_SUFFIX ) set(pip_COMPANY SHS) set(pip_DOMAIN org.SHS) diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp index 2ac99fd7..b1f81389 100755 --- a/utils/code_model_generator/main.cpp +++ b/utils/code_model_generator/main.cpp @@ -203,6 +203,7 @@ void writeClassStreamMembersOut(PIFile & f, const PICodeParser::Entity * e, int piForeachC (PICodeParser::Member & m, ml) { if (is_union && m.isBitfield()) continue; + if (m.meta.value("id") == "-") continue; ++cnt; if (m.meta.contains("id")) cnt = m.meta.value("id").toInt(); @@ -241,6 +242,7 @@ void writeClassStreamMembersIn(PIFile & f, const PICodeParser::Entity * e, int & piForeachC (PICodeParser::Member & m, ml) { if (is_union && m.isBitfield()) continue; + if (m.meta.value("id") == "-") continue; ++cnt; if (m.meta.contains("id")) cnt = m.meta.value("id").toInt(); @@ -278,6 +280,7 @@ bool needClassStream(const PICodeParser::Entity * e) { piForeachC (PICodeParser::Member & m, e->members) { if (m.is_type_ptr || m.isBitfield() || !m.dims.isEmpty() || (m.visibility != PICodeParser::Public)) continue; + if (m.meta.value("id") == "-") continue; return true; } return false;