From e2ab6e316d613a70e8940f657ce04a066cffe6f3 Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 14 Jan 2003 19:51:12 +0000 Subject: [PATCH] We had a lot of cruft in our files from an attempt to support IBM xlC 5.0. We never made it really work with this compiler, so this is all dead code. Get rid of it. git-svn-id: https://svn.dealii.org/trunk@6917 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 44 ----- deal.II/base/include/base/config.h.in | 10 +- .../base/include/base/memory_consumption.h | 6 +- .../base/source/auto_derivative_function.cc | 8 +- deal.II/base/source/data_out_base.cc | 7 - deal.II/base/source/function.cc | 5 - deal.II/base/source/function_derivative.cc | 9 +- deal.II/base/source/function_lib.cc | 7 +- deal.II/base/source/quadrature.cc | 6 - deal.II/base/source/tensor_function.cc | 8 +- deal.II/configure | 166 +----------------- deal.II/configure.in | 1 - .../include/dofs/dof_accessor.templates.h | 5 - deal.II/deal.II/source/dofs/dof_handler.cc | 7 - .../deal.II/source/dofs/dof_renumbering.cc | 6 - deal.II/deal.II/source/dofs/dof_tools.cc | 6 - deal.II/deal.II/source/fe/fe.cc | 4 - deal.II/deal.II/source/fe/fe_system.cc | 6 - deal.II/deal.II/source/fe/fe_tools.cc | 6 - deal.II/deal.II/source/fe/fe_values.cc | 5 - deal.II/deal.II/source/grid/grid_in.cc | 8 - .../deal.II/source/grid/grid_refinement.cc | 6 - .../deal.II/source/grid/grid_reordering.cc | 6 - .../deal.II/source/grid/persistent_tria.cc | 6 - deal.II/deal.II/source/grid/tria.cc | 6 - .../source/multigrid/mg_dof_accessor.cc | 6 - deal.II/deal.II/source/numerics/data_out.cc | 6 - .../source/numerics/data_out_rotation.cc | 4 - .../deal.II/source/numerics/data_out_stack.cc | 6 - .../source/numerics/error_estimator.cc | 6 - deal.II/deal.II/source/numerics/matrices.cc | 7 - .../source/numerics/solution_transfer.cc | 5 - deal.II/deal.II/source/numerics/vectors.cc | 6 - .../lac/include/lac/block_vector.templates.h | 5 - .../lac/include/lac/sparse_vanka.templates.h | 6 - 35 files changed, 10 insertions(+), 401 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 113708c750..e6eb3689ae 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1535,50 +1535,6 @@ AC_DEFUN(DEAL_II_HAVE_PRETTY_FUNCTION, dnl -dnl ------------------------------------------------------------- -dnl IBM xlC 5.0 from the VisualAge C++ pack has a bug with the following -dnl code. We can work around it if we insert code like "using namespace std;" -dnl in the right place, but we'd like to do so only if absolutely necessary. -dnl Check whether the compiler which we are using has this bug. -dnl -dnl Usage: DEAL_II_CHECK_IBM_XLC_ERROR -dnl -dnl ------------------------------------------------------------- -AC_DEFUN(DEAL_II_CHECK_IBM_XLC_ERROR, dnl -[ - AC_MSG_CHECKING(for std::vector bug) - AC_LANG(C++) - CXXFLAGS="$CXXFLAGSG" - AC_TRY_COMPILE( - [ - namespace std { - template class allocator {}; - template > class vector{}; - } - - struct X {}; - template void g (const std::vector &x); - - void f () { - std::vector x; - g<1> (x); - }; - ], - [], - [ - AC_MSG_RESULT(no) - ], - [ - AC_MSG_RESULT(yes. using workaround) - AC_DEFINE(XLC_WORK_AROUND_STD_BUG, 1, - [Define if we have to work around a bug in IBM's xlC compiler. - See the aclocal.m4 file in the top-level directory for a - description of this bug.]) - ]) -]) - - - dnl ------------------------------------------------------------- dnl Sun's Forte compiler (at least up to the Version 7 Early Access dnl release) has a problem with the following code, when compiling diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index e9bf8556f5..fffe90e452 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -5,7 +5,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003 by the deal.II authors +// Copyright (C) 2001, 2002 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -123,9 +123,6 @@ applications. If so, then it is set to one, otherwise to zero. */ #undef DEAL_II_USE_MT -/* Defined if multi-threading is to be achieved by using the ACE library */ -#undef DEAL_II_USE_MT_ACE - /* Defined if multi-threading is to be achieved by using the POSIX functions */ #undef DEAL_II_USE_MT_POSIX @@ -196,11 +193,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define if we have to work around a bug in IBM's xlC compiler. See the - aclocal.m4 file in the top-level directory for a description of this bug. - */ -#undef XLC_WORK_AROUND_STD_BUG - /* If already available, do not define at all. Otherwise, define to __func__ if that is available. In all other cases, indicate that no information about the present function is available for this compiler. */ diff --git a/deal.II/base/include/base/memory_consumption.h b/deal.II/base/include/base/memory_consumption.h index 017f5c583f..026b7e8ec9 100644 --- a/deal.II/base/include/base/memory_consumption.h +++ b/deal.II/base/include/base/memory_consumption.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -460,10 +460,6 @@ namespace MemoryConsumption } -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG - using namespace std; -#endif template unsigned int memory_consumption (const std::vector &v) diff --git a/deal.II/base/source/auto_derivative_function.cc b/deal.II/base/source/auto_derivative_function.cc index a143fc16ae..af219f9f40 100644 --- a/deal.II/base/source/auto_derivative_function.cc +++ b/deal.II/base/source/auto_derivative_function.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -19,12 +19,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template AutoDerivativeFunction::AutoDerivativeFunction (const double hh, const unsigned int n_components, diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc index 6be20c531c..b6d07a6909 100644 --- a/deal.II/base/source/data_out_base.cc +++ b/deal.II/base/source/data_out_base.cc @@ -23,13 +23,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - - template const unsigned int DataOutBase::Patch::no_neighbor; diff --git a/deal.II/base/source/function.cc b/deal.II/base/source/function.cc index 712d014d08..8d3308e383 100644 --- a/deal.II/base/source/function.cc +++ b/deal.II/base/source/function.cc @@ -48,11 +48,6 @@ void Function::vector_value (const Point &, } -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - template void Function::value_list (const std::vector > &points, std::vector &values, diff --git a/deal.II/base/source/function_derivative.cc b/deal.II/base/source/function_derivative.cc index 81c2dae016..d7039233af 100644 --- a/deal.II/base/source/function_derivative.cc +++ b/deal.II/base/source/function_derivative.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -83,13 +83,6 @@ FunctionDerivative::value (const Point &p, -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - - template void FunctionDerivative::value_list (const std::vector > &points, diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index 8df7500e34..e7e7555cba 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -44,11 +44,6 @@ namespace Functions } -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG - using namespace std; -#endif - template void SquareFunction::value_list (const std::vector > &points, diff --git a/deal.II/base/source/quadrature.cc b/deal.II/base/source/quadrature.cc index 6db83a6c25..49401242e8 100644 --- a/deal.II/base/source/quadrature.cc +++ b/deal.II/base/source/quadrature.cc @@ -40,12 +40,6 @@ Quadrature::Quadrature (const unsigned int n_q) : -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template Quadrature::Quadrature (const std::vector > &points, const std::vector &weights) diff --git a/deal.II/base/source/tensor_function.cc b/deal.II/base/source/tensor_function.cc index 79e345c3e3..e12ae0f97c 100644 --- a/deal.II/base/source/tensor_function.cc +++ b/deal.II/base/source/tensor_function.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002 by the deal authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 by the deal authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -44,12 +44,6 @@ TensorFunction::value (const Point &) const } -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template void TensorFunction::value_list (const std::vector > &points, diff --git a/deal.II/configure b/deal.II/configure index 5dc43d6278..4099ec3dcf 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.137 . +# From configure.in Revision: 1.138 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -824,8 +824,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-multithreading=name If name==posix, or no name given, then use - POSIX threads, otherwise assume use of ACE - and use given argument as path to ACE + POSIX threads --with-kdoc=DIR use kdoc installed in DIR --with-docxx=PATH use the doc++ executable pointed to by PATH @@ -3623,95 +3622,9 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - echo "$as_me:$LINENO: checking for ACE" >&5 -echo $ECHO_N "checking for ACE... $ECHO_C" >&6 - if test -d "$withmultithreading" ; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 - else - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 - { { echo "$as_me:$LINENO: error: Invalid ACE path" >&5 -echo "$as_me: error: Invalid ACE path" >&2;} + { { echo "$as_me:$LINENO: error: Invalid flag for --with-multithreading" >&5 +echo "$as_me: error: Invalid flag for --with-multithreading" >&2;} { (exit 1); exit 1; }; } - fi - -cat >>confdefs.h <<\_ACEOF -#define DEAL_II_USE_MT_ACE 1 -_ACEOF - - - if test "$enablemultithreading" = yes ; then - if test "$GXX" = yes ; then - - echo "$as_me:$LINENO: checking whether compilation with ACE disallows flags" >&5 -echo $ECHO_N "checking whether compilation with ACE disallows flags... $ECHO_C" >&6 - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - CXXFLAGS="-pedantic -Werror -I$withmultithreading" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -# include -# include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - deal_II_ace_remove_pedantic="no" - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - deal_II_ace_remove_pedantic="yes" - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - - if test $deal_II_ace_remove_pedantic = "no" ; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - else - echo "$as_me:$LINENO: result: -pedantic" >&5 -echo "${ECHO_T}-pedantic" >&6 - fi - - if test "x$deal_II_ace_remove_pedantic" = "xyes" ; then - CXXFLAGSG="`echo $CXXFLAGSG | perl -pi -e 's/-pedantic//g;'`" - CXXFLAGSO="`echo $CXXFLAGSO | perl -pi -e 's/-pedantic//g;'`" - fi - fi - fi - fi DEAL_II_USE_MT_VAL=1 @@ -3982,77 +3895,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "${ECHO_T}no" >&6 CXXFLAGSO="-DDISABLE_ASSERT_THROW $CXXFLAGSO" -fi -rm -f conftest.$ac_objext conftest.$ac_ext - - - echo "$as_me:$LINENO: checking for std::vector bug" >&5 -echo $ECHO_N "checking for std::vector bug... $ECHO_C" >&6 - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - CXXFLAGS="$CXXFLAGSG" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - namespace std { - template class allocator {}; - template > class vector{}; - } - - struct X {}; - template void g (const std::vector &x); - - void f () { - std::vector x; - g<1> (x); - }; - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - echo "$as_me:$LINENO: result: yes. using workaround" >&5 -echo "${ECHO_T}yes. using workaround" >&6 - -cat >>confdefs.h <<\_ACEOF -#define XLC_WORK_AROUND_STD_BUG 1 -_ACEOF - - fi rm -f conftest.$ac_objext conftest.$ac_ext diff --git a/deal.II/configure.in b/deal.II/configure.in index 640c864b79..2f6b96c37a 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -162,7 +162,6 @@ DEAL_II_CHECK_ASSERT_THROW(debug, $CXXFLAGSG, [CXXFLAGSG="-DDISABLE_ASSERT_THROW $CXXFLAGSG"]) DEAL_II_CHECK_ASSERT_THROW(optimized, $CXXFLAGSO, [CXXFLAGSO="-DDISABLE_ASSERT_THROW $CXXFLAGSO"]) -DEAL_II_CHECK_IBM_XLC_ERROR DEAL_II_CHECK_LOCAL_TYPEDEF_COMP DEAL_II_CHECK_TEMPLATE_SPEC_ACCESS DEAL_II_CHECK_MEMBER_OP_TEMPLATE_INST diff --git a/deal.II/deal.II/include/dofs/dof_accessor.templates.h b/deal.II/deal.II/include/dofs/dof_accessor.templates.h index d4a7da8e92..b430ab0a91 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -261,11 +261,6 @@ DoFObjectAccessor<2,dim>::vertex_dof_index (const unsigned int vertex, } -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - template inline diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index bd976a23ee..0ed0a4c468 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -27,13 +27,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - - template const unsigned int DoFHandler::invalid_dof_index; diff --git a/deal.II/deal.II/source/dofs/dof_renumbering.cc b/deal.II/deal.II/source/dofs/dof_renumbering.cc index 53308ad78f..5f6b159ec7 100644 --- a/deal.II/deal.II/source/dofs/dof_renumbering.cc +++ b/deal.II/deal.II/source/dofs/dof_renumbering.cc @@ -39,12 +39,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - // for whatever reason, the random_shuffle function used below needs // lrand48 to be declared when using -ansi as compiler flag (rather // than do so itself). however, inclusion of or diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index 97166f315c..d05aa72fda 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -37,12 +37,6 @@ #include #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template void diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index cd42b3d900..326d049d74 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -29,10 +29,6 @@ //TODO[GK]: It is relatively confusing with all these update_each, update_once, and in particular update_current flags. there also does not seem to be much documentation at a higher level, except for the documentation of some member variables on this. It would be nice, if we could at least get rid of update_current, to make things a little bit more clear -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif /*------------------------------- FiniteElementBase ----------------------*/ diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index 2affeb011c..e146ac1fbc 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -22,12 +22,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - /* ----------------------- FESystem::InternalData ------------------- */ diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index a445c7537a..bf84766b08 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -27,12 +27,6 @@ #include #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template void FETools::get_interpolation_matrix(const FiniteElement &fe1, diff --git a/deal.II/deal.II/source/fe/fe_values.cc b/deal.II/deal.II/source/fe/fe_values.cc index d6575ceb30..3078dafb31 100644 --- a/deal.II/deal.II/source/fe/fe_values.cc +++ b/deal.II/deal.II/source/fe/fe_values.cc @@ -26,11 +26,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - template void diff --git a/deal.II/deal.II/source/grid/grid_in.cc b/deal.II/deal.II/source/grid/grid_in.cc index 679c4a8203..93c75bdb7e 100644 --- a/deal.II/deal.II/source/grid/grid_in.cc +++ b/deal.II/deal.II/source/grid/grid_in.cc @@ -20,14 +20,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - - - template GridIn::GridIn () : diff --git a/deal.II/deal.II/source/grid/grid_refinement.cc b/deal.II/deal.II/source/grid/grid_refinement.cc index 6be4d6f02b..72bf2f6b71 100644 --- a/deal.II/deal.II/source/grid/grid_refinement.cc +++ b/deal.II/deal.II/source/grid/grid_refinement.cc @@ -260,12 +260,6 @@ GridRefinement::refine_and_coarsen_fixed_fraction (Triangulation &tria, -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template void GridRefinement::refine_and_coarsen_optimize (Triangulation &tria, diff --git a/deal.II/deal.II/source/grid/grid_reordering.cc b/deal.II/deal.II/source/grid/grid_reordering.cc index 2e8f73a40d..f528a8b004 100644 --- a/deal.II/deal.II/source/grid/grid_reordering.cc +++ b/deal.II/deal.II/source/grid/grid_reordering.cc @@ -17,12 +17,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - // static variables #if deal_II_dimension == 2 diff --git a/deal.II/deal.II/source/grid/persistent_tria.cc b/deal.II/deal.II/source/grid/persistent_tria.cc index 48c48d5f8c..cd3fc7ebd6 100644 --- a/deal.II/deal.II/source/grid/persistent_tria.cc +++ b/deal.II/deal.II/source/grid/persistent_tria.cc @@ -18,12 +18,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template PersistentTriangulation:: diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index 9ebc2c99fb..2477752b18 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -1875,12 +1875,6 @@ void Triangulation::refine_global (const unsigned int times) -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template void Triangulation::save_refine_flags (std::vector &v) const { diff --git a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc index 4fa7d7ba34..2028271441 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc @@ -24,12 +24,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - /* ------------------------ MGDoFLineAccessor --------------------------- */ diff --git a/deal.II/deal.II/source/numerics/data_out.cc b/deal.II/deal.II/source/numerics/data_out.cc index c603a6705d..a2d7a01317 100644 --- a/deal.II/deal.II/source/numerics/data_out.cc +++ b/deal.II/deal.II/source/numerics/data_out.cc @@ -33,12 +33,6 @@ #endif -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template DataOut_DoFData::DataEntry:: diff --git a/deal.II/deal.II/source/numerics/data_out_rotation.cc b/deal.II/deal.II/source/numerics/data_out_rotation.cc index d4e0e2ccf9..e15a615de8 100644 --- a/deal.II/deal.II/source/numerics/data_out_rotation.cc +++ b/deal.II/deal.II/source/numerics/data_out_rotation.cc @@ -27,10 +27,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif template diff --git a/deal.II/deal.II/source/numerics/data_out_stack.cc b/deal.II/deal.II/source/numerics/data_out_stack.cc index d3799a61ef..e6b768828a 100644 --- a/deal.II/deal.II/source/numerics/data_out_stack.cc +++ b/deal.II/deal.II/source/numerics/data_out_stack.cc @@ -26,12 +26,6 @@ -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template unsigned int diff --git a/deal.II/deal.II/source/numerics/error_estimator.cc b/deal.II/deal.II/source/numerics/error_estimator.cc index 916d16bf72..b027777bf9 100644 --- a/deal.II/deal.II/source/numerics/error_estimator.cc +++ b/deal.II/deal.II/source/numerics/error_estimator.cc @@ -31,12 +31,6 @@ #include #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - static diff --git a/deal.II/deal.II/source/numerics/matrices.cc b/deal.II/deal.II/source/numerics/matrices.cc index fc2cc4234a..861d3f02ba 100644 --- a/deal.II/deal.II/source/numerics/matrices.cc +++ b/deal.II/deal.II/source/numerics/matrices.cc @@ -34,13 +34,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - - template inline diff --git a/deal.II/deal.II/source/numerics/solution_transfer.cc b/deal.II/deal.II/source/numerics/solution_transfer.cc index 8d95dcfb0c..64201dc5f1 100644 --- a/deal.II/deal.II/source/numerics/solution_transfer.cc +++ b/deal.II/deal.II/source/numerics/solution_transfer.cc @@ -26,11 +26,6 @@ //TODO: the storage of data in the indices_on_cell array is rather inefficient, both in terms of memory as well as in terms of computing time, since we allocate a large array of small vectors. It would be more efficient to use a Table<2> for that, but since we let user pointers point into this data, this is not exactly a 5-minuter to change. should be done, however, sometimes. -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - template SolutionTransfer::SolutionTransfer(const DoFHandler &dof): diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index 151b7963ec..116ba292f2 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -38,12 +38,6 @@ //TODO:[GK] Move templates containing vector arguments to vectors.templates.h -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG -using namespace std; -#endif - - template diff --git a/deal.II/lac/include/lac/block_vector.templates.h b/deal.II/lac/include/lac/block_vector.templates.h index bf056c3fa3..8e256d307c 100644 --- a/deal.II/lac/include/lac/block_vector.templates.h +++ b/deal.II/lac/include/lac/block_vector.templates.h @@ -30,11 +30,6 @@ BlockVector::BlockVector (unsigned int n_blocks, -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG - using namespace std; -#endif - template BlockVector::BlockVector (const std::vector &n) { diff --git a/deal.II/lac/include/lac/sparse_vanka.templates.h b/deal.II/lac/include/lac/sparse_vanka.templates.h index 090bd9e28f..de3a063148 100644 --- a/deal.II/lac/include/lac/sparse_vanka.templates.h +++ b/deal.II/lac/include/lac/sparse_vanka.templates.h @@ -25,12 +25,6 @@ #include -// if necessary try to work around a bug in the IBM xlC compiler -#ifdef XLC_WORK_AROUND_STD_BUG - using namespace std; -#endif - - template SparseVanka::SparseVanka(const SparseMatrix &M, const std::vector &selected, -- 2.39.5