Skip to content

Commit

Permalink
- revert r25066, modelica_string is *NOT* const char*, is MetaModelic…
Browse files Browse the repository at this point in the history
…a string, defined as: typedef modelica_metatype modelica_string;

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25069 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Mar 12, 2015
1 parent 93983eb commit 0779485
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions SimulationRuntime/c/simulation_data.h
Expand Up @@ -208,9 +208,9 @@ typedef struct DATA_STRING_ALIAS
/* collect all attributes from one variable in one struct */
typedef struct REAL_ATTRIBUTE
{
const char* quantity; /* = "" */
const char* unit; /* = "" */
const char* displayUnit; /* = "" */
modelica_string quantity; /* = "" */
modelica_string unit; /* = "" */
modelica_string displayUnit; /* = "" */
modelica_real min; /* = -Inf */
modelica_real max; /* = +Inf */
modelica_boolean fixed; /* depends on the type */
Expand All @@ -222,7 +222,7 @@ typedef struct REAL_ATTRIBUTE

typedef struct INTEGER_ATTRIBUTE
{
const char* quantity; /* = "" */
modelica_string quantity; /* = "" */
modelica_integer min; /* = -Inf */
modelica_integer max; /* = +Inf */
modelica_boolean fixed; /* depends on the type */
Expand All @@ -232,15 +232,15 @@ typedef struct INTEGER_ATTRIBUTE

typedef struct BOOLEAN_ATTRIBUTE
{
const char* quantity; /* = "" */
modelica_string quantity; /* = "" */
modelica_boolean fixed; /* depends on the type */
modelica_boolean useStart; /* = false */
modelica_boolean start; /* = false */
}BOOLEAN_ATTRIBUTE;

typedef struct STRING_ATTRIBUTE
{
const char* quantity; /* = "" */
modelica_string quantity; /* = "" */
modelica_boolean useStart; /* = false */
modelica_string start; /* = "" */
}STRING_ATTRIBUTE;
Expand Down

0 comments on commit 0779485

Please sign in to comment.