From acf0ce7730a2ee40dfdbe8f866e5b1005005ed1a Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 20 Mar 2002 12:40:54 +0000 Subject: [PATCH] Work around a problem of the Sun Forte compiler that chokes on some trailing semicolons, like in /* ---------------------------------------- */ /* Problem 1 -- extraneous semicolon? */ /* (Why does this go away if not a template */ /* or in a namespace?) */ namespace NS1 { template void test () {}; }; /* ---------------------------------------- */ /* Problem 2 -- extraneous semicolon? */ /* (Why for inner but not outer namespace?) */ namespace NS2 { namespace NS3 {}; }; Fix this by simply removing them. git-svn-id: https://svn.dealii.org/trunk@5595 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/source/exceptions.cc | 2 +- deal.II/base/source/function_lib.cc | 34 ++++++++++++++--------------- deal.II/base/source/tensor.cc | 3 +-- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/deal.II/base/source/exceptions.cc b/deal.II/base/source/exceptions.cc index fc4a4bb4b8..bbe4611bfa 100644 --- a/deal.II/base/source/exceptions.cc +++ b/deal.II/base/source/exceptions.cc @@ -229,6 +229,6 @@ namespace deal_II_exceptions std::abort (); }; - }; + } }; diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index 789fb5c4f4..789a3d84d3 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -1113,7 +1113,7 @@ namespace Functions // only simple data elements, so // use sizeof operator return sizeof (*this); - }; + } @@ -1128,7 +1128,7 @@ namespace Functions : Function (1), fourier_coefficients (fourier_coefficients) - {}; + {} @@ -1139,7 +1139,7 @@ namespace Functions { Assert (component==0, ExcIndexRange(component,0,1)); return std::cos(fourier_coefficients * p); - }; + } @@ -1150,7 +1150,7 @@ namespace Functions { Assert (component==0, ExcIndexRange(component,0,1)); return -fourier_coefficients * std::sin(fourier_coefficients * p); - }; + } @@ -1161,7 +1161,7 @@ namespace Functions { Assert (component==0, ExcIndexRange(component,0,1)); return fourier_coefficients.square() * (-std::cos(fourier_coefficients * p)); - }; + } @@ -1176,7 +1176,7 @@ namespace Functions : Function (1), fourier_coefficients (fourier_coefficients) - {}; + {} @@ -1187,7 +1187,7 @@ namespace Functions { Assert (component==0, ExcIndexRange(component,0,1)); return std::sin(fourier_coefficients * p); - }; + } @@ -1198,7 +1198,7 @@ namespace Functions { Assert (component==0, ExcIndexRange(component,0,1)); return fourier_coefficients * std::cos(fourier_coefficients * p); - }; + } @@ -1209,7 +1209,7 @@ namespace Functions { Assert (component==0, ExcIndexRange(component,0,1)); return fourier_coefficients.square() * (-std::sin(fourier_coefficients * p)); - }; + } @@ -1230,7 +1230,7 @@ namespace Functions Assert (fourier_coefficients.size() > 0, ExcInvalidArraySize()); Assert (fourier_coefficients.size() == weights.size(), ExcInvalidArraySize()); - }; + } @@ -1247,7 +1247,7 @@ namespace Functions sum += weights[s] * std::sin(fourier_coefficients[s] * p); return sum; - }; + } @@ -1264,7 +1264,7 @@ namespace Functions sum += fourier_coefficients[s] * std::cos(fourier_coefficients[s] * p); return sum; - }; + } @@ -1281,7 +1281,7 @@ namespace Functions sum -= fourier_coefficients[s].square() * std::sin(fourier_coefficients[s] * p); return sum; - }; + } @@ -1301,7 +1301,7 @@ namespace Functions Assert (fourier_coefficients.size() > 0, ExcInvalidArraySize()); Assert (fourier_coefficients.size() == weights.size(), ExcInvalidArraySize()); - }; + } @@ -1318,7 +1318,7 @@ namespace Functions sum += weights[s] * std::cos(fourier_coefficients[s] * p); return sum; - }; + } @@ -1335,7 +1335,7 @@ namespace Functions sum -= fourier_coefficients[s] * std::sin(fourier_coefficients[s] * p); return sum; - }; + } @@ -1352,7 +1352,7 @@ namespace Functions sum -= fourier_coefficients[s].square() * std::cos(fourier_coefficients[s] * p); return sum; - }; + } // explicit instantiations diff --git a/deal.II/base/source/tensor.cc b/deal.II/base/source/tensor.cc index d910eb8cef..1acb534907 100644 --- a/deal.II/base/source/tensor.cc +++ b/deal.II/base/source/tensor.cc @@ -59,8 +59,7 @@ Tensor::unroll_recursion( Vector& result, unsigned& index) c for (unsigned i=0; i