getfem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Getfem-commits] (no subject)


From: Yves Renard
Subject: [Getfem-commits] (no subject)
Date: Thu, 25 May 2017 12:21:27 -0400 (EDT)

branch: devel-yves
commit 0a2280c3be4188f32b2a28feb02feff3b8a931ac
Author: Yves Renard <address@hidden>
Date:   Thu May 25 17:54:33 2017 +0200

    Removing definition of operator << for std::vector<T> from namespace std
---
 .gitignore                  | 96 +++++++++++++++++++++++++++++++++++++++++++++
 src/getfem/bgeot_config.h   |  3 +-
 src/getfem/getfem_config.h  |  3 +-
 src/gmm/gmm_interface.h     |  9 ++---
 tests/crack.cc              |  2 +
 tests/integration.cc        |  3 +-
 tests/nonlinear_membrane.cc |  2 +
 tests/test_assembly.cc      |  2 +
 8 files changed, 111 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a858c4..78bb75f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *.la
 .deps
 .libs
+*.trs
 Makefile.in
 Makefile
 *~
@@ -208,3 +209,98 @@ doc/sphinx/source/userdoc/images/getfemuserrefine.png
 doc/sphinx/getfem-5.1-docs-html.tar.gz
 doc/sphinx/getfem-5.1-docs-html/
 doc/doxygen/getfem_reference/
+contrib/aposteriori/aposteriori
+contrib/aposteriori/aposteriori_laplacian
+contrib/bimaterial_crack_test/bimaterial_crack_test
+contrib/bimaterial_crack_test/crack
+contrib/crack_plate/crack_bilaplacian
+contrib/crack_plate/crack_mindlin
+contrib/delaminated_crack/delaminated_crack
+contrib/icare/icare
+contrib/*/*.vtk
+contrib/*/*.pos
+contrib/*/*.dx
+contrib/level_set_contact/test_contact
+contrib/mixed_elastostatic/mixed_elastostatic
+contrib/opt_assembly/opt_assembly
+contrib/static_contact_gears/static_contact_gears
+contrib/static_contact_gears/static_contact_gears.RHS
+contrib/static_contact_gears/static_contact_gears.U
+contrib/static_contact_gears/static_contact_gears.VM
+contrib/static_contact_gears/static_contact_gears.mesh
+contrib/static_contact_gears/static_contact_gears.mf
+contrib/static_contact_gears/static_contact_gears.mfd
+contrib/static_contact_gears/static_contact_gears_u1_u2
+contrib/xfem_contact/xfem_contact
+contrib/xfem_contact/xfem_stokes
+contrib/xfem_stab_unilat_contact/xfem_stab_unilat_contact
+interface/tests/*/*.vtk
+interface/tests/*/*.pos
+interface/tests/*/*.dx
+tests/*.vtk
+tests/*.pos
+tests/*.dx
+tests/*.mesh
+tests/Q2_incomplete.msh
+tests/auto_gmm_torture01_lusolve
+tests/auto_gmm_torture01_lusolve.cc
+tests/auto_gmm_torture02_baseop
+tests/auto_gmm_torture02_baseop.cc
+tests/auto_gmm_torture05_mult
+tests/auto_gmm_torture05_mult.cc
+tests/auto_gmm_torture06_mat_mult
+tests/auto_gmm_torture06_mat_mult.cc
+tests/auto_gmm_torture10_qr
+tests/auto_gmm_torture10_qr.cc
+tests/auto_gmm_torture15_sub
+tests/auto_gmm_torture15_sub.cc
+tests/auto_gmm_torture20_iterative_solvers
+tests/auto_gmm_torture20_iterative_solvers.cc
+tests/bilaplacian
+tests/crack
+tests/cyl_slicer
+tests/dynamic_array
+tests/dynamic_tas
+tests/elastostatic
+tests/geo_trans_inv
+tests/heat_equation
+tests/helmholtz
+tests/integration
+tests/laplacian
+tests/laplacian_with_bricks
+tests/nonlinear_elastostatic
+tests/nonlinear_elastostatic.mf
+tests/nonlinear_elastostatic.mfd
+tests/nonlinear_membrane
+tests/nonlinear_membrane.mf
+tests/nonlinear_membrane.mfd
+tests/plasticity
+tests/plasticity.U
+tests/plasticity.coef
+tests/plasticity.meshfem
+tests/plate
+tests/poly
+tests/schwarz_additive
+tests/stokes
+tests/test_assembly
+tests/test_continuation
+tests/test_gmm_matrix_functions
+tests/test_int_set
+tests/test_interpolated_fem
+tests/test_interpolation
+tests/test_kdtree
+tests/test_mat_elem
+tests/test_mat_elem.mesh
+tests/test_mesh
+tests/test_mesh_generation
+tests/test_mesh_im_level_set
+tests/test_range_basis
+tests/test_range_basis.mesh
+tests/test_rtree
+tests/test_slice
+tests/test_slice.sl
+tests/test_slice2.sl
+tests/test_small_vector
+tests/test_tree_sorted
+tests/thermo_elasticity_electrical_coupling
+tests/wave_equation
diff --git a/src/getfem/bgeot_config.h b/src/getfem/bgeot_config.h
index 399f43c..8ff645e 100644
--- a/src/getfem/bgeot_config.h
+++ b/src/getfem/bgeot_config.h
@@ -72,7 +72,8 @@ namespace bgeot {
 
   using std::endl; using std::cout; using std::cerr;
   using std::ends; using std::cin;
-  
+  template <typename T> std::ostream &operator <<
+  (std::ostream &o, const std::vector<T>& m) { gmm::write(o,m); return o; }
 
   static const size_t ST_NIL = size_t(-1);
   typedef gmm::uint16_type dim_type;
diff --git a/src/getfem/getfem_config.h b/src/getfem/getfem_config.h
index aad3864..666930b 100644
--- a/src/getfem/getfem_config.h
+++ b/src/getfem/getfem_config.h
@@ -218,7 +218,8 @@ namespace getfem {
 
   using std::endl; using std::cout; using std::cerr;
   using std::ends; using std::cin;
-
+  template <typename T> std::ostream &operator <<
+  (std::ostream &o, const std::vector<T>& m) { gmm::write(o,m); return o; }
 
 #if GETFEM_PARA_LEVEL > 1
   template <typename T> inline T MPI_SUM_SCALAR(T a) {
diff --git a/src/gmm/gmm_interface.h b/src/gmm/gmm_interface.h
index 040d50e..c89ff57 100644
--- a/src/gmm/gmm_interface.h
+++ b/src/gmm/gmm_interface.h
@@ -230,12 +230,9 @@ namespace gmm {
     { return it[i]; }
     static void resize(this_type &v, size_type n) { v.resize(n); }
   };
-}
-namespace std {
-  template <typename T> ostream &operator <<
-  (std::ostream &o, const vector<T>& m) { gmm::write(o,m); return o; }
-}
-namespace gmm {
+
+  template <typename T> std::ostream &operator <<
+  (std::ostream &o, const std::vector<T>& m) { gmm::write(o,m); return o; }
 
   template <typename T>
   inline size_type nnz(const std::vector<T>& l) { return l.size(); }
diff --git a/tests/crack.cc b/tests/crack.cc
index c6a9d7c..647d299 100644
--- a/tests/crack.cc
+++ b/tests/crack.cc
@@ -42,6 +42,8 @@
 
 using std::endl; using std::cout; using std::cerr;
 using std::ends; using std::cin;
+template <typename T> std::ostream &operator <<
+  (std::ostream &o, const std::vector<T>& m) { gmm::write(o,m); return o; }
 
 /* some GetFEM++ types that we will be using */
 using bgeot::base_small_vector; /* special class for small (dim<16) vectors */
diff --git a/tests/integration.cc b/tests/integration.cc
index 8aeb698..b47be78 100644
--- a/tests/integration.cc
+++ b/tests/integration.cc
@@ -27,7 +27,8 @@
 #include <map>
 using std::endl; using std::cout; using std::cerr;
 using std::ends; using std::cin;
-
+template <typename T> std::ostream &operator <<
+  (std::ostream &o, const std::vector<T>& m) { gmm::write(o,m); return o; }
 
 using getfem::size_type;
 using getfem::short_type;
diff --git a/tests/nonlinear_membrane.cc b/tests/nonlinear_membrane.cc
index e08b218..b436a86 100644
--- a/tests/nonlinear_membrane.cc
+++ b/tests/nonlinear_membrane.cc
@@ -36,6 +36,8 @@
 
 using std::endl; using std::cout; using std::cerr;
 using std::ends; using std::cin;
+template <typename T> std::ostream &operator <<
+  (std::ostream &o, const std::vector<T>& m) { gmm::write(o,m); return o; }
 
 /* some GetFEM++ types that we will be using */
 using bgeot::base_small_vector; /* special class for small (dim<16) vectors */
diff --git a/tests/test_assembly.cc b/tests/test_assembly.cc
index d635a9d..30fde32 100644
--- a/tests/test_assembly.cc
+++ b/tests/test_assembly.cc
@@ -33,6 +33,8 @@
 #endif
 using std::endl; using std::cout; using std::cerr;
 using std::ends; using std::cin;
+template <typename T> std::ostream &operator <<
+  (std::ostream &o, const std::vector<T>& m) { gmm::write(o,m); return o; }
 
 using bgeot::base_vector;
 using bgeot::base_matrix;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]