Commit 61acd40e authored by Kirill Nikitin's avatar Kirill Nikitin
Browse files

Fixed linux compilation issues

parent bd2c1337
...@@ -3242,7 +3242,7 @@ public: ...@@ -3242,7 +3242,7 @@ public:
Li = LineIndecesU[Li]; Li = LineIndecesU[Li];
} }
LF_Address[k].last = static_cast<INMOST_DATA_ENUM_TYPE>(LF_Entries.size()); LF_Address[k].last = static_cast<INMOST_DATA_ENUM_TYPE>(LF_Entries.size());
assert(std::is_sorted(LF_Entries.begin()+LF_Address[k].first,LF_Entries.end())); //assert(std::is_sorted(LF_Entries.begin()+LF_Address[k].first,LF_Entries.end()));
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// clean linked list // // clean linked list //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
......
...@@ -282,10 +282,10 @@ bool SolverSolvePetsc(KSP *ksp, Vec *rhs, Vec *sol) ...@@ -282,10 +282,10 @@ bool SolverSolvePetsc(KSP *ksp, Vec *rhs, Vec *sol)
ierr = KSPGetOptionsPrefix(*ksp, const_cast<const char **>(&prefix)); ierr = KSPGetOptionsPrefix(*ksp, const_cast<const char **>(&prefix));
if (ierr != PETSC_SUCCESS) throw INMOST::ErrorInSolver; if (ierr != PETSC_SUCCESS) throw INMOST::ErrorInSolver;
//due to https://www.mcs.anl.gov/petsc/documentation/changes/37.html //due to https://www.mcs.anl.gov/petsc/documentation/changes/37.html
#if PETSC_VERSION_MAJOR >= 3 || (PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 7) #if PETSC_VERSION_MAJOR > 3 || (PETSC_VERSION_MAJOR == 3 && PETSC_VERSION_MINOR >= 7)
ierr = PetscOptionsGetString(NULL,prefix, "-ksp_type", typeksp, 2048, &haveksp); ierr = PetscOptionsGetString(NULL,prefix, "-ksp_type", typeksp, 2048, &haveksp);
#else //PETSC_VERSION #else //PETSC_VERSION
ierr = PetscOptionsGetString(prefix, "-ksp_type", typeksp, 2048, &haveksp); ierr = PetscOptionsGetString(prefix, "-ksp_type", typeksp, 2048, &haveksp);
#endif //PETSC_VERSION #endif //PETSC_VERSION
if (ierr != PETSC_SUCCESS) throw INMOST::ErrorInSolver; if (ierr != PETSC_SUCCESS) throw INMOST::ErrorInSolver;
if (haveksp && !strcmp(typeksp, "preonly")) guess = false; if (haveksp && !strcmp(typeksp, "preonly")) guess = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment