Skip to content

Commit

Permalink
- fix for clang compiler
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18368 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Marcus Walther committed Dec 2, 2013
1 parent d4e1139 commit 0bb4123
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Compiler/runtime/HpcOmSchedulerExt.cpp
Expand Up @@ -31,7 +31,7 @@ void* HpcOmSchedulerExtImpl__readScheduleFromGraphMl(const char *filename)
return res;
}

void* HpcOmSchedulerExtImpl__scheduleAdjList(std::list<long int> adjLst[])
void* HpcOmSchedulerExtImpl__scheduleAdjList(std::list<std::list<long int> > adjLst)
{
void *res = mk_nil();

Expand Down
4 changes: 2 additions & 2 deletions Compiler/runtime/HpcOmSchedulerExt_omc.cpp
Expand Up @@ -15,7 +15,7 @@ extern void* HpcOmSchedulerExt_readScheduleFromGraphMl(const char *filename)
extern void* HpcOmSchedulerExt_scheduleAdjList(modelica_metatype adjList)
{
int nelts = (int)MMC_HDRSLOTS(MMC_GETHDR(adjList));
std::list<long int> adjLsts[nelts];
std::list<std::list<long int> > adjLsts = std::list<std::list<long int> >();

for(int i=0; i<nelts; ++i)
{
Expand All @@ -28,7 +28,7 @@ extern void* HpcOmSchedulerExt_scheduleAdjList(modelica_metatype adjList)
adjLstE = MMC_CDR(adjLstE);
}

adjLsts[i] = adjLst;
adjLsts.push_back(adjLst);
}

return HpcOmSchedulerExtImpl__scheduleAdjList(adjLsts);
Expand Down
4 changes: 2 additions & 2 deletions Compiler/runtime/HpcOmSchedulerExt_rml.cpp
Expand Up @@ -49,7 +49,7 @@ RML_END_LABEL
RML_BEGIN_LABEL(HpcOmSchedulerExt__scheduleAdjList)
{
int nelts = (int)RML_HDRSLOTS(RML_GETHDR(rmlA0)); //number of elements in array
std::list<long int> adjLsts[nelts];
std::list<std::list<long int> > adjLsts = std::list<std::list<long int> >();

std::cerr << "element count: " << nelts << std::endl;

Expand All @@ -66,7 +66,7 @@ RML_BEGIN_LABEL(HpcOmSchedulerExt__scheduleAdjList)
adjLstE = RML_CDR(adjLstE);
}

adjLsts[i] = adjLst;
adjLsts.push_back(adjLst);
}

rmlA0 = HpcOmSchedulerExtImpl__scheduleAdjList(adjLsts);
Expand Down

0 comments on commit 0bb4123

Please sign in to comment.