From 4767d7feaaad8f20033b0f8ea0fd6df5ccfb85a7 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Mon, 20 Oct 2014 13:23:42 +0200
Subject: [PATCH] Fixed compiler error and other minor changes
---
BaseLib/CPUTime.h | 2 +-
BaseLib/RunTime.h | 2 +-
MathLib/LinAlg/PETSc/PETScLinearSolver.h | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/BaseLib/CPUTime.h b/BaseLib/CPUTime.h
index 6f0b1845574..fc72f563a2e 100644
--- a/BaseLib/CPUTime.h
+++ b/BaseLib/CPUTime.h
@@ -32,7 +32,7 @@ class CPUTime
}
/// Get the elapsed time after started.
- double elapsed()
+ const double elapsed()
{
return (clock() - _start_time)/static_cast<double>(CLOCKS_PER_SEC);
}
diff --git a/BaseLib/RunTime.h b/BaseLib/RunTime.h
index bb55470e2e0..cb67269a0b4 100644
--- a/BaseLib/RunTime.h
+++ b/BaseLib/RunTime.h
@@ -50,7 +50,7 @@ class RunTime
}
/// Get the elapsed time after started.
- double elapsed()
+ const double elapsed()
{
#if defined(USE_MPI)
return MPI_Wtime() - _start_time;
diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.h b/MathLib/LinAlg/PETSc/PETScLinearSolver.h
index c908e914c93..1496df53a59 100644
--- a/MathLib/LinAlg/PETSc/PETScLinearSolver.h
+++ b/MathLib/LinAlg/PETSc/PETScLinearSolver.h
@@ -23,7 +23,6 @@
#include "PETScMatrix.h"
#include "PETScVector.h"
-#include "BaseLib/PETScWallClockTimer.h"
namespace MathLib
{
--
GitLab