From 30fefd066c12f8cb397098139fadbf2daf36afe0 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 9 Nov 2012 14:42:12 +0000 Subject: [PATCH] Minor fixes to silence a bunch of warnings git-svn-id: https://svn.dealii.org/trunk@27488 0785d39b-7218-0410-832d-ea1e28bc413d --- .../boost/property_tree/detail/ptree_implementation.hpp | 2 +- deal.II/include/deal.II/base/tensor_base.h | 3 ++- deal.II/source/base/data_out_base.cc | 6 +++--- deal.II/source/fe/fe_system.cc | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/deal.II/contrib/boost-1.49.0/include/boost/property_tree/detail/ptree_implementation.hpp b/deal.II/contrib/boost-1.49.0/include/boost/property_tree/detail/ptree_implementation.hpp index e1839ffb6d..31d60e3ee2 100644 --- a/deal.II/contrib/boost-1.49.0/include/boost/property_tree/detail/ptree_implementation.hpp +++ b/deal.II/contrib/boost-1.49.0/include/boost/property_tree/detail/ptree_implementation.hpp @@ -389,7 +389,7 @@ namespace boost { namespace property_tree template bool operator ()(const P& lhs, const P& rhs) const { return lhs.first < rhs.first; - }; + } }; } diff --git a/deal.II/include/deal.II/base/tensor_base.h b/deal.II/include/deal.II/base/tensor_base.h index f6e1c7d6ed..0627a6dfb2 100644 --- a/deal.II/include/deal.II/base/tensor_base.h +++ b/deal.II/include/deal.II/base/tensor_base.h @@ -607,7 +607,7 @@ class Tensor<1,dim,Number> * constructor to disallow the * creation of such an object. */ - Number values[(dim!=0) ? (dim) : 1]; + Number values[(dim!=0) ? (dim) : (dim+1)]; /** * Help function for unroll. If @@ -990,6 +990,7 @@ Tensor<1,dim,Number>::operator = (const Tensor<1,dim,Number> &p) values[1] = p.values[1]; break; case 3: + values[0] = p.values[0]; values[1] = p.values[1]; values[2] = p.values[2]; diff --git a/deal.II/source/base/data_out_base.cc b/deal.II/source/base/data_out_base.cc index 9d4a1afe05..ecb23fa36f 100644 --- a/deal.II/source/base/data_out_base.cc +++ b/deal.II/source/base/data_out_base.cc @@ -1084,7 +1084,7 @@ namespace unsigned int d2, unsigned int d3) { - int nodes[8]; + int nodes[1<::dx_to_deal[0]] = start; nodes[GeometryInfo::dx_to_deal[1]] = start+d1; if (dim>=2) @@ -1306,7 +1306,7 @@ namespace unsigned int d2, unsigned int d3) { - int nodes[8]; + int nodes[1<::ucd_to_deal[0]] = start; nodes[GeometryInfo::ucd_to_deal[1]] = start+d1; if (dim>=2) @@ -5898,7 +5898,6 @@ void DataOutBase::write_hdf5_parallel (const std::vector > & (void)comm; AssertThrow(false, ExcMessage ("HDF5 support is disabled.")); #else - int world_size; hid_t h5_file_id, plist_id; hid_t node_dataspace, node_dataset, node_file_dataspace, node_memory_dataspace; hid_t cell_dataspace, cell_dataset, cell_file_dataspace, cell_memory_dataspace; @@ -5911,6 +5910,7 @@ void DataOutBase::write_hdf5_parallel (const std::vector > & // If HDF5 is not parallel and we're using multiple processes, abort #ifndef H5_HAVE_PARALLEL #ifdef DEAL_II_COMPILER_SUPPORTS_MPI + int world_size; MPI_Comm_size(comm, &world_size); AssertThrow (world_size <= 1, ExcMessage ("Serial HDF5 output on multiple processes is not yet supported.")); diff --git a/deal.II/source/fe/fe_system.cc b/deal.II/source/fe/fe_system.cc index faf1f3dd08..33d6b8cd9c 100644 --- a/deal.II/source/fe/fe_system.cc +++ b/deal.II/source/fe/fe_system.cc @@ -36,7 +36,7 @@ namespace return std::count_if(vec.begin(), vec.end(), IsNonZero); } -}; +} /* ----------------------- FESystem::InternalData ------------------- */ -- 2.39.5