From da48575caa89246b3648a7ea7be8530a1e48eacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Sun, 11 Feb 2018 15:09:06 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@596 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/piversion.h | 2 +- utils/code_model_generator/main.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src_main/piversion.h b/src_main/piversion.h index c29432fe..ce8d88b1 100644 --- a/src_main/piversion.h +++ b/src_main/piversion.h @@ -3,7 +3,7 @@ #define PIVERSION_H #define PIP_VERSION_MAJOR 1 -#define PIP_VERSION_MINOR 5 +#define PIP_VERSION_MINOR 6 #define PIP_VERSION_REVISION 0 #define PIP_VERSION_SUFFIX "" diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp index c43602ad..0a57b3ba 100755 --- a/utils/code_model_generator/main.cpp +++ b/utils/code_model_generator/main.cpp @@ -167,6 +167,8 @@ void writeClassStreamMembersOut(PIFile & f, const PICodeParser::Entity * e, int if (is_union && m.isBitfield()) continue; ++cnt; + if (m.meta.contains("id")) + cnt = m.meta.value("id").toInt(); if (m.dims.isEmpty()) { f << "\tcs << cs.chunk(" << cnt << ", "; if (parser.isEnum(m.type)) @@ -203,6 +205,8 @@ void writeClassStreamMembersIn(PIFile & f, const PICodeParser::Entity * e, int & if (is_union && m.isBitfield()) continue; ++cnt; + if (m.meta.contains("id")) + cnt = m.meta.value("id").toInt(); if (m.dims.isEmpty()) { f << "\t\tcase " << cnt << ": cs.get("; if (parser.isEnum(m.type))