From f059f8a9b87ea50a13c24ec0525cce5ed708e3b9 Mon Sep 17 00:00:00 2001
From: Dmitrij Naumov <dmitrij@naumov.de>
Date: Sat, 20 Jul 2013 17:31:03 +0200
Subject: [PATCH] Remove extra ';' after member function definition.
---
GeoLib/SensorData.h | 14 +++++++-------
GeoLib/Station.h | 8 ++++----
GeoLib/Surface.h | 2 +-
MathLib/LinAlg/Dense/DenseMatrix.h | 4 ++--
MathLib/LinAlg/Dense/DenseVector.h | 6 +++---
MathLib/LinAlg/Sparse/SparseMatrixBase.h | 2 +-
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/GeoLib/SensorData.h b/GeoLib/SensorData.h
index 72e116cdd10..bcd5010306c 100644
--- a/GeoLib/SensorData.h
+++ b/GeoLib/SensorData.h
@@ -91,25 +91,25 @@ public:
const std::vector<float>* getTimeSeries(SensorDataType::type time_series_name) const;
/// Returns all time series names contained in this container
- const std::vector<SensorDataType::type>& getTimeSeriesNames() const { return _vec_names; };
+ const std::vector<SensorDataType::type>& getTimeSeriesNames() const { return _vec_names; }
/// Returns the time step vector (if it exists)
- const std::vector<std::size_t>& getTimeSteps() const { return _time_steps; };
+ const std::vector<std::size_t>& getTimeSteps() const { return _time_steps; }
/// Returns the first time step
- std::size_t getStartTime() const { return _start; };
+ std::size_t getStartTime() const { return _start; }
/// Returns the last time step
- std::size_t getEndTime() const { return _end; };
+ std::size_t getEndTime() const { return _end; }
/// Returns the interval between time steps (Returns "0" if a vector is given!)
- std::size_t getStepSize() const { return _step_size; };
+ std::size_t getStepSize() const { return _step_size; }
/// Allows to set a unit for the time steps
- void setTimeUnit(TimeStepType::type t) { _time_unit = t; };
+ void setTimeUnit(TimeStepType::type t) { _time_unit = t; }
/// Returns the unit the time steps
- TimeStepType::type getTimeUnit() const { return _time_unit; };
+ TimeStepType::type getTimeUnit() const { return _time_unit; }
/// Returns the data unit of the given time series
std::string getDataUnit(SensorDataType::type t) const;
diff --git a/GeoLib/Station.h b/GeoLib/Station.h
index 513100ec075..e4d66b08cb4 100644
--- a/GeoLib/Station.h
+++ b/GeoLib/Station.h
@@ -144,16 +144,16 @@ public:
static Station* createStation(const std::string &name, double x, double y, double z);
/// Returns the specific value for this station
- double getStationValue() { return this->_station_value; };
+ double getStationValue() { return this->_station_value; }
/// Allows to set a specific value for this station (e.g. for classification)
- void setStationValue(double station_value) { this->_station_value = station_value; };
+ void setStationValue(double station_value) { this->_station_value = station_value; }
/// Allows to add sensor data from a CSV file to the observation site
- void addSensorDataFromCSV(const std::string &file_name) { this->_sensor_data = new SensorData(file_name); };
+ void addSensorDataFromCSV(const std::string &file_name) { this->_sensor_data = new SensorData(file_name); }
/// Returns all the sensor data for this observation site
- const SensorData* getSensorData() { return this->_sensor_data; };
+ const SensorData* getSensorData() { return this->_sensor_data; }
protected:
/**
diff --git a/GeoLib/Surface.h b/GeoLib/Surface.h
index abd3ae012f1..8a9deabdd5b 100644
--- a/GeoLib/Surface.h
+++ b/GeoLib/Surface.h
@@ -67,7 +67,7 @@ public:
*/
bool isPntInSfc (const double *pnt) const;
- const std::vector<Point*> *getPointVec() const { return &_sfc_pnts; };
+ const std::vector<Point*> *getPointVec() const { return &_sfc_pnts; }
/**
* method allows access to the internal axis aligned bounding box
diff --git a/MathLib/LinAlg/Dense/DenseMatrix.h b/MathLib/LinAlg/Dense/DenseMatrix.h
index 8f21abf4a71..90ebf1a06d5 100644
--- a/MathLib/LinAlg/Dense/DenseMatrix.h
+++ b/MathLib/LinAlg/Dense/DenseMatrix.h
@@ -136,9 +136,9 @@ protected:
IDX_TYPE _n_cols;
// zero based addressing, but Fortran storage layout
- //inline IDX_TYPE address(IDX_TYPE i, IDX_TYPE j) const { return j*rows+i; };
+ //inline IDX_TYPE address(IDX_TYPE i, IDX_TYPE j) const { return j*rows+i; }
// zero based addressing, C storage layout
- inline IDX_TYPE address(IDX_TYPE i, IDX_TYPE j) const { return i*_n_cols+j; };
+ inline IDX_TYPE address(IDX_TYPE i, IDX_TYPE j) const { return i*_n_cols+j; }
FP_TYPE *_data;
};
diff --git a/MathLib/LinAlg/Dense/DenseVector.h b/MathLib/LinAlg/Dense/DenseVector.h
index 1d297b2bc5e..309930dfd3b 100644
--- a/MathLib/LinAlg/Dense/DenseVector.h
+++ b/MathLib/LinAlg/Dense/DenseVector.h
@@ -51,13 +51,13 @@ public:
std::size_t getRangeEnd() const { return this->size(); }
/// get entry
- double get(std::size_t i) const { return (*this)[i]; };
+ double get(std::size_t i) const { return (*this)[i]; }
/// set a value to entry
- void set(std::size_t i, double v) { (*this)[i] = v; };
+ void set(std::size_t i, double v) { (*this)[i] = v; }
/// add a value to entry
- void add(std::size_t i, double v) { (*this)[i] += v; };
+ void add(std::size_t i, double v) { (*this)[i] += v; }
/**
* add a sub vector
diff --git a/MathLib/LinAlg/Sparse/SparseMatrixBase.h b/MathLib/LinAlg/Sparse/SparseMatrixBase.h
index 8a96fcb15b8..5ac0ded8974 100644
--- a/MathLib/LinAlg/Sparse/SparseMatrixBase.h
+++ b/MathLib/LinAlg/Sparse/SparseMatrixBase.h
@@ -19,7 +19,7 @@ public:
* @param y result vector
*/
virtual void amux(FP_TYPE d, FP_TYPE const * const __restrict__ x, FP_TYPE * __restrict__ y) const = 0;
- virtual ~SparseMatrixBase() {};
+ virtual ~SparseMatrixBase() {}
/**
* get the number of rows
* @return the number of rows
--
GitLab