From 43b1f1c57eee6268b54d2a834e39aa0afc794e1a Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Thu, 2 Dec 2004 12:07:24 +0000
Subject: [PATCH] Replaced absolute include path concerning headers in the same
 directory with relative ones. Removed __ from defines.

[[Imported from SVN: r1196]]
---
 common/alignment.hh       |  4 ++--
 common/arraylist.hh       | 11 +++++------
 common/enumset.hh         |  6 ------
 common/iteratorfacades.hh |  7 ++++---
 common/logictraits.hh     |  5 +++--
 common/poolallocator.hh   |  2 +-
 common/sllist.hh          |  6 +++---
 istl/communicator.hh      |  2 +-
 istl/remoteindices.hh     |  4 ++--
 9 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/common/alignment.hh b/common/alignment.hh
index 153fdade7..4fab4cf82 100644
--- a/common/alignment.hh
+++ b/common/alignment.hh
@@ -1,8 +1,8 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
 // $Id$
-#ifndef __DUNE_ALIGNMENT_HH__
-#define __DUNE_ALIGNMENT_HH__
+#ifndef DUNE_ALIGNMENT_HH
+#define DUNE_ALIGNMENT_HH
 #include <cstddef>
 
 namespace Dune
diff --git a/common/arraylist.hh b/common/arraylist.hh
index 4e0a1a74e..ae7b6f378 100644
--- a/common/arraylist.hh
+++ b/common/arraylist.hh
@@ -2,14 +2,13 @@
 // vi: set et ts=4 sw=2 sts=2:
 // $Id$
 
-#ifndef __DUNE_ARRAYLIST_HH__
-#define __DUNE_ARRAYLIST_HH__
+#ifndef DUNE_ARRAYLIST_HH
+#define DUNE_ARRAYLIST_HH
 
 #include <vector>
-#include <dune/common/smartpointer.hh>
-#include <dune/common/fixedarray.hh>
-#include <dune/common/iteratorfacades.hh>
-#include <dune/common/poolallocator.hh>
+#include "smartpointer.hh"
+#include "fixedarray.hh"
+#include "iteratorfacades.hh"
 
 namespace Dune
 {
diff --git a/common/enumset.hh b/common/enumset.hh
index da9e67529..4a068b084 100644
--- a/common/enumset.hh
+++ b/common/enumset.hh
@@ -77,12 +77,6 @@ namespace Dune
     static bool contains(const TA& item);
   };
 
-  template<class TI, typename TA>
-  inline bool PODSet<TI,TA>::contains(const Type& attribute)
-  {
-    return static_cast<Implementation*>(this)->contains();
-  }
-
   template<typename TA>
   inline bool EmptySet<TA>::contains(const TA& attribute)
   {
diff --git a/common/iteratorfacades.hh b/common/iteratorfacades.hh
index 308bd57c8..2cf1b34e4 100644
--- a/common/iteratorfacades.hh
+++ b/common/iteratorfacades.hh
@@ -1,10 +1,11 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
 // $Id$
-#ifndef __DUNE_ITERATORFACADES_HH__
-#define __DUNE_ITERATORFACADES_HH__
+#ifndef DUNE_ITERATORFACADES_HH
+#define DUNE_ITERATORFACADES_HH
 #include <iterator>
-#include <dune/common/typetraits.hh>
+#include "typetraits.hh"
+
 namespace Dune
 {
   /*! \defgroup IteratorFacades Iterator facades
diff --git a/common/logictraits.hh b/common/logictraits.hh
index c6df4034e..b6d8e9bc7 100644
--- a/common/logictraits.hh
+++ b/common/logictraits.hh
@@ -1,7 +1,8 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#ifndef __DUNE_LOCICTRAITS_H__
-#define __DUNE_LOCICTRAITS_H__
+// $ Id $
+#ifndef DUNE_LOCICTRAITS_H
+#define DUNE_LOCICTRAITS_H
 
 namespace Dune {
   /** @addtogroup Common
diff --git a/common/poolallocator.hh b/common/poolallocator.hh
index 677c06b5b..a495beb0f 100644
--- a/common/poolallocator.hh
+++ b/common/poolallocator.hh
@@ -4,7 +4,7 @@
 #ifndef DUNE_COMMON_POOLALLOCATOR_HH
 #define DUNE_COMMON_POOLALLOCATOR_HH
 
-#include <dune/common/alignment.hh>
+#include "alignment.hh"
 
 namespace Dune
 {
diff --git a/common/sllist.hh b/common/sllist.hh
index 016e28013..ca3c713f8 100644
--- a/common/sllist.hh
+++ b/common/sllist.hh
@@ -1,10 +1,10 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#ifndef __DUNE__SLLIST_HH__
-#define __DUNE__SLLIST_HH__
+#ifndef DUNE__SLLIST_HH
+#define DUNE__SLLIST_HH
 
 #include <memory>
-#include <dune/common/iteratorfacades.hh>
+#include "iteratorfacades.hh"
 
 namespace Dune
 {
diff --git a/istl/communicator.hh b/istl/communicator.hh
index 6292911b9..d1a3db51b 100644
--- a/istl/communicator.hh
+++ b/istl/communicator.hh
@@ -3,7 +3,7 @@
 #ifndef DUNE_COMMUNICATOR
 #define DUNE_COMMUNICATOR
 
-#include <dune/istl/remoteindices.hh>
+#include "remoteindices.hh"
 #include <dune/common/exceptions.hh>
 namespace Dune
 {
diff --git a/istl/remoteindices.hh b/istl/remoteindices.hh
index 024397d6d..5a421f6a8 100644
--- a/istl/remoteindices.hh
+++ b/istl/remoteindices.hh
@@ -3,13 +3,13 @@
 #ifndef DUNE_REMOTEINDICES_HH
 #define DUNE_REMOTEINDICES_HH
 
-#include <dune/istl/indexset.hh>
+#include "indexset.hh"
 #include <dune/common/poolallocator.hh>
 #include <dune/common/sllist.hh>
 #include <map>
 #include <utility>
 #include <iostream>
-#include <dune/istl/mpitraits.hh>
+#include "mpitraits.hh"
 #include "mpi.h"
 
 namespace Dune {
-- 
GitLab