Skip to content

Commit d6a16a2

Browse files
[Janitor mode] Fix whitespace
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20874 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 6dbc72c commit d6a16a2

File tree

7 files changed

+33
-34
lines changed

7 files changed

+33
-34
lines changed

Compiler/Template/CodegenCpp.tpl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ case SIMCODE(modelInfo=MODELINFO(__)) then
223223
<<
224224
#pragma once
225225
#include "OMCpp<%fileNamePrefix%>.h"
226-
226+
227227
<%if Flags.isSet(Flags.WRITE_TO_BUFFER) then
228228
<<
229229
#include "ReduceDAE/Interfaces/IReduceDAE.h"
@@ -233,7 +233,7 @@ case SIMCODE(modelInfo=MODELINFO(__)) then
233233
>>
234234
else
235235
<<
236-
236+
237237
typedef HistoryImpl<TextFileWriter,<%numAlgvars(modelInfo)%>+<%numInOutvars(modelInfo)%>+<%numAliasvars(modelInfo)%>+<%numStatevars(modelInfo)%>,<%numDerivativevars(modelInfo)%>,0> HistoryImplType;
238238

239239
>>%>
@@ -1332,7 +1332,7 @@ OFILES=$(CPPFILES:.cpp=.o)
13321332
.PHONY: <%lastIdentOfPath(modelInfo.name)%> $(CPPFILES)
13331333

13341334
<%fileNamePrefix%>: $(MAINFILE) $(OFILES)
1335-
<%\t%>$(CXX) -shared -I. -o $(SYSTEMOBJ) $(OFILES) $(CPPFLAGS) $(LDSYTEMFLAGS) <%dirExtra%> <%libsPos1%> <%libsPos2%>
1335+
<%\t%>$(CXX) -shared -I. -o $(SYSTEMOBJ) $(OFILES) $(CPPFLAGS) $(LDSYTEMFLAGS) <%dirExtra%> <%libsPos1%> <%libsPos2%>
13361336
<%\t%>$(CXX) $(CPPFLAGS) -I. -o $(MAINOBJ) $(MAINFILE) $(LDMAINFLAGS)
13371337
<% if boolNot(stringEq(makefileParams.platform, "win32")) then
13381338
<<
@@ -5478,8 +5478,8 @@ end initValst;
54785478
/*
54795479
template initValst(Text &varDecls , list<SimVar> varsLst, SimCode simCode, Context context) ::=
54805480
varsLst |> sv as SIMVAR(__) =>
5481-
let &preExp = buffer ""
5482-
let &varDeclsCref = buffer ""
5481+
let &preExp = buffer ""
5482+
let &varDeclsCref = buffer ""
54835483
match initialValue
54845484
case SOME(v) then
54855485
match daeExp(v, contextOther, &preExp, &varDecls,simCode)
@@ -5508,8 +5508,8 @@ end initValst;
55085508
/*
55095509
template initAliasValst(Text &varDecls ,list<SimVar> varsLst, SimCode simCode, Context context) ::=
55105510
varsLst |> sv as SIMVAR(__) =>
5511-
let &preExp = buffer ""
5512-
let &varDeclsCref = buffer ""
5511+
let &preExp = buffer ""
5512+
let &varDeclsCref = buffer ""
55135513
match initialValue
55145514
case SOME(v) then
55155515
match daeExp(v, contextOther, &preExp, &varDecls,simCode)
@@ -5547,12 +5547,12 @@ template initAliasValst(Text &varDecls ,Text type,list<SimVar> varsLst, SimCode
55475547
case vStr as "(0)" then
55485548
'<%preExp%>
55495549
set<%type%>StartValue(<%getAliasVarName(sv.aliasvar, simCode,context)%>,<%vStr%>,"<%cref(sv.name)%>");'
5550-
5551-
5550+
5551+
55525552
case vStr as "" then
55535553
'<%preExp%>
55545554
set<%type%>StartValue(<%getAliasVarName(sv.aliasvar, simCode,context)%>,<%vStr%>,"<%cref(sv.name)%>");'
5555-
5555+
55565556
case vStr then
55575557
'<%preExp%>
55585558
set<%type%>StartValue(<%getAliasVarName(sv.aliasvar, simCode,context)%>,<%vStr%>,"<%cref(sv.name)%>");'
@@ -7892,7 +7892,7 @@ template crefStartValueType2(DAE.Type ty)
78927892
case T_BOOL(__) then 'Bool'
78937893
else "error start value type"
78947894
end match
7895-
7895+
78967896

78977897
end crefStartValueType2;
78987898

SimulationRuntime/cpp/Core/System/SystemDefaultImplementation.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#include <System/AlgLoopSolverFactory.h>
88

99

10-
template <class T>
10+
template <class T>
1111
void InitVars<T>::setStartValue(T variable,string key)
1212
{
1313
_start_values[key] = variable;
1414
};
15-
template <class T>
15+
template <class T>
1616
T InitVars<T>::getGetStartValue(string key)
1717
{
1818
return _start_values[key];
@@ -458,15 +458,15 @@ double SystemDefaultImplementation::delay(unsigned int expr_id,double expr_value
458458
{
459459
var=val;
460460
_bool_start_values.setStartValue(val,key);
461-
461+
462462
}
463463
void SystemDefaultImplementation::setIntStartValue(int& var,int val, string key)
464464
{
465-
var=val;
465+
var=val;
466466
_int_start_values.setStartValue(val,key);
467-
467+
468468
}
469-
469+
470470

471471
/*
472472
template int SystemDefaultImplementation::getStartValue(int variable,string key);

SimulationRuntime/cpp/Core/System/tpl.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
//template class boost::shared_ptr<ISimData>;
99
template class boost::multi_array<double,2>;
1010
template class boost::multi_array<double,1>;
11-
template class boost::multi_array<int,2>;
11+
template class boost::multi_array<int,2>;
1212
template class boost::multi_array<int,1>;
1313
template class ublas::vector<double>;
14-
template class ublas::vector<int>;
14+
template class ublas::vector<int>;
1515
template class uBlas::compressed_matrix<double, uBlas::column_major, 0, uBlas::unbounded_array<int>, uBlas::unbounded_array<double> > ;
16-
template class std::vector<int>;
17-
template class std::vector<double>;
16+
template class std::vector<int>;
17+
template class std::vector<double>;
1818
template class unordered_map<string,unsigned int>;
1919
template class map<unsigned int,string>;
2020
template class vector<string>;

SimulationRuntime/cpp/Include/Core/Modelica.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ typedef boost::function<void (unordered_map<string,unsigned int>&,unordered_map<
134134
#include <Math/Utility.h>
135135
#include "HistoryImpl.h"
136136
#include "DataExchange/Policies/TextfileWriter.h"
137-
137+

SimulationRuntime/cpp/Include/Core/ModelicaDefine.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ typedef double coshRetType;
3434
//extern template class boost::shared_ptr<ISimData>;
3535
extern template class boost::multi_array<double,2>;
3636
extern template class boost::multi_array<double,1>;
37-
extern template class boost::multi_array<int,2>;
37+
extern template class boost::multi_array<int,2>;
3838
extern template class boost::multi_array<int,1>;
3939
extern template class ublas::vector<double>;
40-
extern template class ublas::vector<int>;
40+
extern template class ublas::vector<int>;
4141
extern template class uBlas::compressed_matrix<double, uBlas::column_major, 0, uBlas::unbounded_array<int>, uBlas::unbounded_array<double> > ;
42-
extern template class std::vector<int>;
43-
extern template class std::vector<double>;
42+
extern template class std::vector<int>;
43+
extern template class std::vector<double>;
4444
extern template class unordered_map<string,unsigned int>;
4545
extern template class map<unsigned int,string>;
4646
extern template class vector<string>;

SimulationRuntime/cpp/Include/Core/System/SystemDefaultImplementation.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Copyright (c) 2008, OSMC
3434

3535
//typedef boost::unordered_map<std::string, boost::any> SValuesMap;
3636

37-
template <class T>
37+
template <class T>
3838
class InitVars
3939
{
4040
public:
@@ -128,15 +128,15 @@ class BOOST_EXTENSION_SYSTEM_DECL SystemDefaultImplementation
128128
void storeTime(double time);
129129
double delay(unsigned int expr_id,double expr_value, double delayTime, double delayMax);
130130
bool isConsistent();
131-
132-
131+
132+
133133
double getRealStartValue(string key);
134134
bool getBoolStartValue(string key);
135135
int getIntStartValue(string key);
136136
void setRealStartValue(double& var,double val,string key);
137137
void setBoolStartValue(bool& var,bool val, string key);
138138
void setIntStartValue(int& var,int val, string key);
139-
139+
140140
double
141141
_simTime; ///< current simulation time (given by the solver)
142142

@@ -170,8 +170,8 @@ class BOOST_EXTENSION_SYSTEM_DECL SystemDefaultImplementation
170170
InitVars<double> _real_start_values;
171171
InitVars<int> _int_start_values;
172172
InitVars<bool> _bool_start_values;
173-
174-
173+
174+
175175
EventHandling _event_handling;
176176

177177
typedef boost::circular_buffer<double> buffer_type;
@@ -183,4 +183,3 @@ class BOOST_EXTENSION_SYSTEM_DECL SystemDefaultImplementation
183183
};
184184

185185

186-

SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#include <SimulationSettings/IGlobalSettings.h>
5050
#include <SimController/ISimController.h> */
5151
#include <SimCoreFactory/OMCFactory/OMCFactory.h>
52-
52+
5353
#else
5454
#error "operating system not supported"
5555
#endif

0 commit comments

Comments
 (0)