Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22101 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Sep 2, 2014
1 parent 08750ba commit 59dee8d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions SimulationRuntime/cpp/Core/Math/ArrayOperations.cpp
Expand Up @@ -26,7 +26,7 @@ void cat_array (int k,BaseArray<T>& a, vector<BaseArray<T>* >& x )
/* check dim sizes of all inputs */
if(n<1)
throw std::invalid_argument("No input arrays");

if(x[0]->getDims().size() < k)
throw std::invalid_argument("Wrong dimension for input array");

Expand Down Expand Up @@ -81,7 +81,7 @@ void cat_array (int k,BaseArray<T>& a, vector<BaseArray<T>* >& x )
}
}
}


}
template void cat_array<double> (int k,BaseArray<double>& a, vector<BaseArray<double>* >& x );
Expand Down
10 changes: 5 additions & 5 deletions SimulationRuntime/cpp/Include/Core/Math/Array.h
Expand Up @@ -58,7 +58,7 @@ template<class T>class BaseArray
{
throw std::invalid_argument("Wrong virtual Array setDims call");
}

bool isStatic()
{
return _static;
Expand Down Expand Up @@ -100,7 +100,7 @@ template<typename T, std::size_t size>class StatArrayDim1 : public BaseArray<T>
{
if (this != &rhs)
{

try
{
if(rhs.isStatic())
Expand All @@ -113,15 +113,15 @@ template<typename T, std::size_t size>class StatArrayDim1 : public BaseArray<T>
DynArrayDim1<T>& a = dynamic_cast<DynArrayDim1<T>& >(rhs);
const T* data = rhs.getData();
memcpy( _real_array.begin(), data, size * sizeof( T ) );

}
}
catch(std::bad_exception & be)
{
throw std::runtime_error("Wrong array type assign");

}

}
return *this;
}
Expand Down

0 comments on commit 59dee8d

Please sign in to comment.