From 938d33f080eb171b79c786c52a6e096bfb42dc6c Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 16 Nov 2011 15:42:45 +0000
Subject: [PATCH] the size of a function space basis is now a size_t, not an
int
[[Imported from SVN: r4868]]
---
dune/fufem/functionspacebases/conformingbasis.hh | 2 +-
dune/fufem/functionspacebases/dgpqkbasis.hh | 2 +-
dune/fufem/functionspacebases/extensionbasis.hh | 2 +-
dune/fufem/functionspacebases/functionspacebasis.hh | 2 +-
dune/fufem/functionspacebases/p0basis.hh | 2 +-
dune/fufem/functionspacebases/p1nodalbasis.hh | 2 +-
dune/fufem/functionspacebases/p2hierarchicalbasis.hh | 2 +-
.../functionspacebases/p2hierarchicalwithelementbubblesbasis.hh | 2 +-
dune/fufem/functionspacebases/p2nodalbasis.hh | 2 +-
dune/fufem/functionspacebases/p3nodalbasis.hh | 2 +-
dune/fufem/functionspacebases/q1nodalbasis.hh | 2 +-
dune/fufem/functionspacebases/reducedconformingbasis.hh | 2 +-
dune/fufem/functionspacebases/refinedp0basis.hh | 2 +-
dune/fufem/functionspacebases/refinedp1nodalbasis.hh | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dune/fufem/functionspacebases/conformingbasis.hh b/dune/fufem/functionspacebases/conformingbasis.hh
index 218b9f4d..7a48e368 100644
--- a/dune/fufem/functionspacebases/conformingbasis.hh
+++ b/dune/fufem/functionspacebases/conformingbasis.hh
@@ -99,7 +99,7 @@ class ConformingBasis :
dofConstraints_->setupFromBasis<NonconformingBasis>(ncBasis_);
}
- int size() const
+ size_t size() const
{
return ncBasis_.size();
}
diff --git a/dune/fufem/functionspacebases/dgpqkbasis.hh b/dune/fufem/functionspacebases/dgpqkbasis.hh
index da4dd5b4..c34022e5 100644
--- a/dune/fufem/functionspacebases/dgpqkbasis.hh
+++ b/dune/fufem/functionspacebases/dgpqkbasis.hh
@@ -44,7 +44,7 @@ class DgPQKBasis :
dgIndexSet_(gridview)
{}
- int size() const
+ size_t size() const
{
return dgIndexSet_.size();
}
diff --git a/dune/fufem/functionspacebases/extensionbasis.hh b/dune/fufem/functionspacebases/extensionbasis.hh
index 034b3398..f8af04b2 100644
--- a/dune/fufem/functionspacebases/extensionbasis.hh
+++ b/dune/fufem/functionspacebases/extensionbasis.hh
@@ -57,7 +57,7 @@ class ExtensionBasis :
update();
}
- int size() const
+ size_t size() const
{
return extendedBasis_.size();
}
diff --git a/dune/fufem/functionspacebases/functionspacebasis.hh b/dune/fufem/functionspacebases/functionspacebasis.hh
index a2fc4753..252acb44 100644
--- a/dune/fufem/functionspacebases/functionspacebasis.hh
+++ b/dune/fufem/functionspacebases/functionspacebasis.hh
@@ -33,7 +33,7 @@ class FunctionSpaceBasis
gridview_(gridview)
{}
- virtual int size() const
+ virtual size_t size() const
{
DUNE_THROW(Dune::NotImplemented, "You called the empty base class method");
}
diff --git a/dune/fufem/functionspacebases/p0basis.hh b/dune/fufem/functionspacebases/p0basis.hh
index 67ae110f..3a6d1321 100644
--- a/dune/fufem/functionspacebases/p0basis.hh
+++ b/dune/fufem/functionspacebases/p0basis.hh
@@ -50,7 +50,7 @@ class P0Basis :
mapper_(gridview)
{}
- int size() const
+ size_t size() const
{
return mapper_.size();
}
diff --git a/dune/fufem/functionspacebases/p1nodalbasis.hh b/dune/fufem/functionspacebases/p1nodalbasis.hh
index f4bf8a50..d14a53c0 100644
--- a/dune/fufem/functionspacebases/p1nodalbasis.hh
+++ b/dune/fufem/functionspacebases/p1nodalbasis.hh
@@ -44,7 +44,7 @@ class P1NodalBasis :
Base(gridview)
{}
- int size() const
+ size_t size() const
{
return gridview_.indexSet().size(dim);
}
diff --git a/dune/fufem/functionspacebases/p2hierarchicalbasis.hh b/dune/fufem/functionspacebases/p2hierarchicalbasis.hh
index 8023123b..c476a6dc 100644
--- a/dune/fufem/functionspacebases/p2hierarchicalbasis.hh
+++ b/dune/fufem/functionspacebases/p2hierarchicalbasis.hh
@@ -46,7 +46,7 @@ class P2HierarchicalBasis :
mapper_(gridview)
{}
- int size() const
+ size_t size() const
{
return mapper_.size();
}
diff --git a/dune/fufem/functionspacebases/p2hierarchicalwithelementbubblesbasis.hh b/dune/fufem/functionspacebases/p2hierarchicalwithelementbubblesbasis.hh
index c0331208..4f0f7947 100644
--- a/dune/fufem/functionspacebases/p2hierarchicalwithelementbubblesbasis.hh
+++ b/dune/fufem/functionspacebases/p2hierarchicalwithelementbubblesbasis.hh
@@ -54,7 +54,7 @@ class P2HierarchicalWithElementBubblesBasis :
localFE_()
{}
- int size() const
+ size_t size() const
{
return mapper_.size();
}
diff --git a/dune/fufem/functionspacebases/p2nodalbasis.hh b/dune/fufem/functionspacebases/p2nodalbasis.hh
index 71dc7f8e..f94527b2 100644
--- a/dune/fufem/functionspacebases/p2nodalbasis.hh
+++ b/dune/fufem/functionspacebases/p2nodalbasis.hh
@@ -81,7 +81,7 @@ class P2NodalBasis :
mapper_(gridview)
{}
- int size() const
+ size_t size() const
{
return mapper_.size();
}
diff --git a/dune/fufem/functionspacebases/p3nodalbasis.hh b/dune/fufem/functionspacebases/p3nodalbasis.hh
index 519f6174..db8809f8 100644
--- a/dune/fufem/functionspacebases/p3nodalbasis.hh
+++ b/dune/fufem/functionspacebases/p3nodalbasis.hh
@@ -66,7 +66,7 @@ class P3NodalBasis :
}
/** \brief The number of degrees of freedom of the function space */
- int size() const
+ size_t size() const
{
switch (dim) {
case 1:
diff --git a/dune/fufem/functionspacebases/q1nodalbasis.hh b/dune/fufem/functionspacebases/q1nodalbasis.hh
index 38918ead..bd28259d 100644
--- a/dune/fufem/functionspacebases/q1nodalbasis.hh
+++ b/dune/fufem/functionspacebases/q1nodalbasis.hh
@@ -42,7 +42,7 @@ class Q1NodalBasis :
localFE_()
{}
- int size() const
+ size_t size() const
{
return gridview_.indexSet().size(dim);
}
diff --git a/dune/fufem/functionspacebases/reducedconformingbasis.hh b/dune/fufem/functionspacebases/reducedconformingbasis.hh
index 599b4995..0d3829ce 100644
--- a/dune/fufem/functionspacebases/reducedconformingbasis.hh
+++ b/dune/fufem/functionspacebases/reducedconformingbasis.hh
@@ -74,7 +74,7 @@ class ReducedConformingBasis :
reorder();
}
- int size() const
+ size_t size() const
{
return unconstrainedSize_;
}
diff --git a/dune/fufem/functionspacebases/refinedp0basis.hh b/dune/fufem/functionspacebases/refinedp0basis.hh
index 102a9986..5336da62 100644
--- a/dune/fufem/functionspacebases/refinedp0basis.hh
+++ b/dune/fufem/functionspacebases/refinedp0basis.hh
@@ -52,7 +52,7 @@ class RefinedP0Basis :
mapper_.update();
}
- int size() const
+ size_t size() const
{
return mapper_.size() * localFE_.localBasis().size();
}
diff --git a/dune/fufem/functionspacebases/refinedp1nodalbasis.hh b/dune/fufem/functionspacebases/refinedp1nodalbasis.hh
index 1490fc4d..7c308061 100644
--- a/dune/fufem/functionspacebases/refinedp1nodalbasis.hh
+++ b/dune/fufem/functionspacebases/refinedp1nodalbasis.hh
@@ -44,7 +44,7 @@ class RefinedP1NodalBasis :
mapper_(gridview)
{}
- int size() const
+ size_t size() const
{
return mapper_.size();
}
--
GitLab