Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit 93a4aed

Browse files
hkielOpenModelica-Hudson
authored andcommitted
make unmodified objects constant
1 parent 415de24 commit 93a4aed

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

SimulationRuntime/c/util/boolean_array.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -635,21 +635,21 @@ m_boolean* boolean_array_element_addr(const boolean_array_t* source,int ndims,..
635635
* k is one based
636636
*/
637637
void cat_boolean_array(int k, boolean_array_t* dest, int n,
638-
boolean_array_t* first,...)
638+
const boolean_array_t* first,...)
639639
{
640640
va_list ap;
641641
int i, j, r, c;
642642
int n_sub = 1, n_super = 1;
643643
int new_k_dim_size = 0;
644-
boolean_array_t **elts = (boolean_array_t**)malloc(sizeof(boolean_array_t *) * n);
644+
const boolean_array_t **elts = (const boolean_array_t**)malloc(sizeof(boolean_array_t *) * n);
645645

646646
assert(elts);
647647
/* collect all array ptrs to simplify traversal.*/
648648
va_start(ap, first);
649649
elts[0] = first;
650650

651651
for(i = 1; i < n; i++) {
652-
elts[i] = va_arg(ap,boolean_array_t*);
652+
elts[i] = va_arg(ap,const boolean_array_t*);
653653
}
654654
va_end(ap);
655655

@@ -697,21 +697,21 @@ void cat_boolean_array(int k, boolean_array_t* dest, int n,
697697
* k is one based
698698
*/
699699
void cat_alloc_boolean_array(int k, boolean_array_t* dest, int n,
700-
boolean_array_t* first,...)
700+
const boolean_array_t* first,...)
701701
{
702702
va_list ap;
703703
int i, j, r, c;
704704
int n_sub = 1, n_super = 1;
705705
int new_k_dim_size = 0;
706-
boolean_array_t **elts = (boolean_array_t**)malloc(sizeof(boolean_array_t *) * n);
706+
const boolean_array_t **elts = (const boolean_array_t**)malloc(sizeof(boolean_array_t *) * n);
707707

708708
assert(elts);
709709
/* collect all array ptrs to simplify traversal.*/
710710
va_start(ap, first);
711711
elts[0] = first;
712712

713713
for(i = 1; i < n; i++) {
714-
elts[i] = va_arg(ap,boolean_array_t*);
714+
elts[i] = va_arg(ap,const boolean_array_t*);
715715
}
716716
va_end(ap);
717717

SimulationRuntime/c/util/boolean_array.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ extern m_boolean* boolean_array_element_addr1(const boolean_array_t* source,int
159159
extern m_boolean* boolean_array_element_addr2(const boolean_array_t* source,int ndims,int dim1,int dim2);
160160

161161
extern void cat_boolean_array(int k,boolean_array_t* dest, int n,
162-
boolean_array_t* first,...);
162+
const boolean_array_t* first,...);
163163
extern void cat_alloc_boolean_array(int k,boolean_array_t* dest, int n,
164-
boolean_array_t* first,...);
164+
const boolean_array_t* first,...);
165165

166166
extern void promote_boolean_array(const boolean_array_t* a, int n,boolean_array_t* dest);
167167
extern void promote_scalar_boolean_array(modelica_boolean s,int n,

SimulationRuntime/c/util/integer_array.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -635,21 +635,21 @@ modelica_integer* integer_array_element_addr(const integer_array_t * source,int
635635
* k is one based
636636
*/
637637
void cat_integer_array(int k, integer_array_t* dest, int n,
638-
integer_array_t* first,...)
638+
const integer_array_t* first,...)
639639
{
640640
va_list ap;
641641
int i, j, r, c;
642642
int n_sub = 1, n_super = 1;
643643
int new_k_dim_size = 0;
644-
integer_array_t **elts = (integer_array_t**)malloc(sizeof(integer_array_t *) * n);
644+
const integer_array_t **elts = (const integer_array_t**)malloc(sizeof(integer_array_t *) * n);
645645

646646
omc_assert_macro(elts);
647647
/* collect all array ptrs to simplify traversal.*/
648648
va_start(ap, first);
649649
elts[0] = first;
650650

651651
for(i = 1; i < n; i++) {
652-
elts[i] = va_arg(ap,integer_array_t*);
652+
elts[i] = va_arg(ap,const integer_array_t*);
653653
}
654654
va_end(ap);
655655

@@ -697,21 +697,21 @@ void cat_integer_array(int k, integer_array_t* dest, int n,
697697
* k is one based
698698
*/
699699
void cat_alloc_integer_array(int k, integer_array_t* dest, int n,
700-
integer_array_t* first,...)
700+
const integer_array_t* first,...)
701701
{
702702
va_list ap;
703703
int i, j, r, c;
704704
int n_sub = 1, n_super = 1;
705705
int new_k_dim_size = 0;
706-
integer_array_t **elts = (integer_array_t**)malloc(sizeof(integer_array_t *) * n);
706+
const integer_array_t **elts = (const integer_array_t**)malloc(sizeof(integer_array_t *) * n);
707707

708708
omc_assert_macro(elts);
709709
/* collect all array ptrs to simplify traversal.*/
710710
va_start(ap, first);
711711
elts[0] = first;
712712

713713
for(i = 1; i < n; i++) {
714-
elts[i] = va_arg(ap,integer_array_t*);
714+
elts[i] = va_arg(ap,const integer_array_t*);
715715
}
716716
va_end(ap);
717717

SimulationRuntime/c/util/integer_array.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ extern modelica_integer* integer_array_element_addr2(const integer_array_t * sou
164164
int dim1,int dim2);
165165

166166
extern void cat_integer_array(int k,integer_array_t* dest, int n,
167-
integer_array_t* first,...);
167+
const integer_array_t* first,...);
168168
extern void cat_alloc_integer_array(int k,integer_array_t* dest, int n,
169-
integer_array_t* first,...);
169+
const integer_array_t* first,...);
170170

171171
extern void range_alloc_integer_array(modelica_integer start, modelica_integer stop,
172172
modelica_integer inc,integer_array_t* dest);

SimulationRuntime/c/util/real_array.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -620,21 +620,21 @@ modelica_real* real_array_element_addr(const real_array_t * source,int ndims,...
620620
* k is one based
621621
*/
622622
void cat_real_array(int k, real_array_t* dest, int n,
623-
real_array_t* first,...)
623+
const real_array_t* first,...)
624624
{
625625
va_list ap;
626626
int i, j, r, c;
627627
int n_sub = 1, n_super = 1;
628628
int new_k_dim_size = 0;
629-
real_array_t **elts = (real_array_t**)malloc(sizeof(real_array_t *) * n);
629+
const real_array_t **elts = (const real_array_t**)malloc(sizeof(real_array_t *) * n);
630630

631631
omc_assert_macro(elts);
632632
/* collect all array ptrs to simplify traversal.*/
633633
va_start(ap, first);
634634
elts[0] = first;
635635

636636
for(i = 1; i < n; i++) {
637-
elts[i] = va_arg(ap,real_array_t*);
637+
elts[i] = va_arg(ap,const real_array_t*);
638638
}
639639
va_end(ap);
640640

@@ -682,21 +682,21 @@ void cat_real_array(int k, real_array_t* dest, int n,
682682
* k is one based
683683
*/
684684
void cat_alloc_real_array(int k, real_array_t* dest, int n,
685-
real_array_t* first,...)
685+
const real_array_t* first,...)
686686
{
687687
va_list ap;
688688
int i, j, r, c;
689689
int n_sub = 1, n_super = 1;
690690
int new_k_dim_size = 0;
691-
real_array_t **elts = (real_array_t**)malloc(sizeof(real_array_t *) * n);
691+
const real_array_t **elts = (const real_array_t**)malloc(sizeof(real_array_t *) * n);
692692

693693
omc_assert_macro(elts);
694694
/* collect all array ptrs to simplify traversal.*/
695695
va_start(ap, first);
696696
elts[0] = first;
697697

698698
for(i = 1; i < n; i++) {
699-
elts[i] = va_arg(ap,real_array_t*);
699+
elts[i] = va_arg(ap,const real_array_t*);
700700
}
701701
va_end(ap);
702702

SimulationRuntime/c/util/real_array.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ extern modelica_real* real_array_element_addr(const real_array_t * source,int nd
151151
extern modelica_real* real_array_element_addr1(const real_array_t * source,int ndims,int dim1);
152152
extern modelica_real* real_array_element_addr2(const real_array_t * source,int ndims,int dim1,int dim2);
153153

154-
extern void cat_real_array(int k,real_array_t* dest, int n, real_array_t* first,...);
155-
extern void cat_alloc_real_array(int k,real_array_t* dest, int n, real_array_t* first,...);
154+
extern void cat_real_array(int k,real_array_t* dest, int n, const real_array_t* first,...);
155+
extern void cat_alloc_real_array(int k,real_array_t* dest, int n, const real_array_t* first,...);
156156

157157
extern void range_alloc_real_array(modelica_real start,modelica_real stop,modelica_real inc,
158158
real_array_t* dest);

SimulationRuntime/c/util/string_array.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -588,21 +588,21 @@ modelica_string* string_array_element_addr(const string_array_t * source,
588588
* k is one based
589589
*/
590590
void cat_string_array(int k, string_array_t* dest, int n,
591-
string_array_t* first,...)
591+
const string_array_t* first,...)
592592
{
593593
va_list ap;
594594
int i, j, r, c;
595595
int n_sub = 1, n_super = 1;
596596
int new_k_dim_size = 0;
597-
string_array_t **elts = (string_array_t**)malloc(sizeof(string_array_t *) * n);
597+
const string_array_t **elts = (const string_array_t**)malloc(sizeof(string_array_t *) * n);
598598

599599
assert(elts);
600600
/* collect all array ptrs to simplify traversal.*/
601601
va_start(ap, first);
602602
elts[0] = first;
603603

604604
for(i = 1; i < n; i++) {
605-
elts[i] = va_arg(ap,string_array_t*);
605+
elts[i] = va_arg(ap,const string_array_t*);
606606
}
607607
va_end(ap);
608608

@@ -650,21 +650,21 @@ void cat_string_array(int k, string_array_t* dest, int n,
650650
* k is one based
651651
*/
652652
void cat_alloc_string_array(int k, string_array_t* dest, int n,
653-
string_array_t* first,...)
653+
const string_array_t* first,...)
654654
{
655655
va_list ap;
656656
int i, j, r, c;
657657
int n_sub = 1, n_super = 1;
658658
int new_k_dim_size = 0;
659-
string_array_t **elts = (string_array_t**)malloc(sizeof(string_array_t *) * n);
659+
const string_array_t **elts = (const string_array_t**)malloc(sizeof(string_array_t *) * n);
660660

661661
assert(elts);
662662
/* collect all array ptrs to simplify traversal.*/
663663
va_start(ap, first);
664664
elts[0] = first;
665665

666666
for(i = 1; i < n; i++) {
667-
elts[i] = va_arg(ap,string_array_t*);
667+
elts[i] = va_arg(ap,const string_array_t*);
668668
}
669669
va_end(ap);
670670

SimulationRuntime/c/util/string_array.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ extern modelica_string* string_array_element_addr2(const string_array_t * source
140140
int dim1,int dim2);
141141

142142
extern void cat_string_array(int k,string_array_t* dest, int n,
143-
string_array_t* first,...);
143+
const string_array_t* first,...);
144144
extern void cat_alloc_string_array(int k,string_array_t* dest, int n,
145-
string_array_t* first,...);
145+
const string_array_t* first,...);
146146

147147
extern void promote_string_array(const string_array_t * a, int n,string_array_t* dest);
148148
extern void promote_scalar_string_array(modelica_string s,int n,

0 commit comments

Comments
 (0)