Skip to content
Snippets Groups Projects
Commit 97bd50a9 authored by René Fritze's avatar René Fritze
Browse files

[all] more c++11 / whitespace cleanups

parent 10052c84
No related branches found
No related tags found
No related merge requests found
...@@ -5,15 +5,6 @@ ...@@ -5,15 +5,6 @@
#ifndef LOGGING_HH_INCLUDED #ifndef LOGGING_HH_INCLUDED
#define LOGGING_HH_INCLUDED #define LOGGING_HH_INCLUDED
#include <fstream>
#include <ostream>
#include <sstream>
#include <ctime>
#include <iomanip>
#include <map>
#include <assert.h>
// dune-common
#include <dune/common/exceptions.hh> #include <dune/common/exceptions.hh>
#include "misc.hh" #include "misc.hh"
...@@ -25,6 +16,13 @@ ...@@ -25,6 +16,13 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include <fstream>
#include <ostream>
#include <sstream>
#include <ctime>
#include <iomanip>
#include <map>
#include <assert.h>
namespace Dune { namespace Dune {
namespace Stuff { namespace Stuff {
......
...@@ -131,14 +131,13 @@ static RangeType1 dyadicProduct(const RangeType2& arg1, const RangeType2& arg2) ...@@ -131,14 +131,13 @@ static RangeType1 dyadicProduct(const RangeType2& arg1, const RangeType2& arg2)
typedef typename RangeType1::RowIterator MatrixRowIteratorType; typedef typename RangeType1::RowIterator MatrixRowIteratorType;
typedef typename RangeType2::ConstIterator ConstVectorIteratorType; typedef typename RangeType2::ConstIterator ConstVectorIteratorType;
typedef typename RangeType2::Iterator VectorIteratorType; typedef typename RangeType2::Iterator VectorIteratorType;
MatrixRowIteratorType rItEnd = ret.end(); const MatrixRowIteratorType rItEnd = ret.end();
ConstVectorIteratorType arg1It = arg1.begin(); ConstVectorIteratorType arg1It = arg1.begin();
for (MatrixRowIteratorType rIt = ret.begin(); rIt != rItEnd; ++rIt) { for (MatrixRowIteratorType rIt = ret.begin(); rIt != rItEnd; ++rIt) {
ConstVectorIteratorType arg2It = arg2.begin(); ConstVectorIteratorType arg2It = arg2.begin();
VectorIteratorType vItEnd = rIt->end(); const VectorIteratorType vItEnd = rIt->end();
for (VectorIteratorType vIt = rIt->begin(); vIt != vItEnd; ++vIt) { for (VectorIteratorType vIt = rIt->begin(); vIt != vItEnd; ++vIt, ++arg2It) {
*vIt = *arg1It * *arg2It; *vIt = *arg1It * *arg2It;
++arg2It;
} }
++arg1It; ++arg1It;
} }
...@@ -151,8 +150,6 @@ class MinMaxAvg ...@@ -151,8 +150,6 @@ class MinMaxAvg
{ {
protected: protected:
typedef MinMaxAvg<ElementType> ThisType; typedef MinMaxAvg<ElementType> ThisType;
typedef std::vector<ElementType> ElementsVec;
typedef typename ElementsVec::const_iterator ElementsVecConstIterator;
public: public:
MinMaxAvg() MinMaxAvg()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment