[Dune] [Dune-Commit] dune-common r6387 - in branches/release-2.1: . doc/doxygen dune/common dune/common/test

[Oliver Sander]

Hi Markus!
I don't think this is really necessary.  It should be easy to adapt the
hack in the gmshreader to work with the new interface.  I could have
a look, but it may take a few days.

best,
Oliver

Am 07.03.2011 16:32, schrieb mblatt at dune-project.org:
> Author: mblatt
> Date: 2011-03-07 16:32:48 +0100 (Mon, 07 Mar 2011)
> New Revision: 6387
>
> Removed:
>     branches/release-2.1/dune/common/test/testfconstruct.cc
> Modified:
>     branches/release-2.1/
>     branches/release-2.1/doc/doxygen/
>     branches/release-2.1/dune/common/fvector.hh
>     branches/release-2.1/dune/common/test/
>     branches/release-2.1/dune/common/test/Makefile.am
> Log:
> Reverting all fvector changes as they break the gmshreader
> and thus make the release unstable.
>
> Better a dangerous interface than an unstable release.
>
> @Oliver: I second your comment
> @Robert: Thank god there is a developer that never makes mistakes. I really admire those guys.
>
>
>
>
> Property changes on: branches/release-2.1
> ___________________________________________________________________
> Modified: svn:mergeinfo
>     - /trunk:6355-6356,6359,6362
>     + /trunk:6355-6356,6359,6362,6371
>
>
> Property changes on: branches/release-2.1/doc/doxygen
> ___________________________________________________________________
> Modified: svn:mergeinfo
>     - /trunk/doc/doxygen:6359-6360,6362
>     + /trunk/doc/doxygen:6359-6360,6362,6371
>
> Modified: branches/release-2.1/dune/common/fvector.hh
> ===================================================================
> --- branches/release-2.1/dune/common/fvector.hh	2011-03-07 15:27:34 UTC (rev 6386)
> +++ branches/release-2.1/dune/common/fvector.hh	2011-03-07 15:32:48 UTC (rev 6387)
> @@ -13,7 +13,6 @@
>   #include "exceptions.hh"
>   #include "array.hh"
>   #include "densevector.hh"
> -#include "static_assert.hh"
>
>   namespace Dune {
>
> @@ -88,14 +87,6 @@
>           _data[i] = x[i];
>       }
>
> -    //! Constructor making vector with identical coordinates
> -    template<class K1, int SIZE1>
> -	explicit FieldVector (const FieldVector<K1,SIZE1>  &  x)
> -	{
> -      dune_static_assert(SIZE1 == SIZE, "FieldVector in constructor has wrong size");
> -      for (size_type i = 0; i<SIZE; i++)
> -        _data[i] = x[i];
> -    }
>       using Base::operator=;
>
>       // make this thing a vector
>
>
> Property changes on: branches/release-2.1/dune/common/test
> ___________________________________________________________________
> Modified: svn:ignore
>     - Makefile
> Makefile.in
> .deps
> .libs
> semantic.cache
> dynvectortest
> fvectortest
> mpicollcomm
> lrutest
> test-stack
> arraylisttest
> shared_ptrtest
> float_cmp
> bitsetvectortest
> iteratorfacadetest
> sllisttest
> tuplestest
> tupleutilitytest
> enumsettest
> fmatrixtest
> dynmatrixtest
> polyallocator
> poolallocatortest
> *.gcda
> *.gcno
> gmon.out
> gcdlcmtest
> streamtest
> exprtmpl
> timing_xpr
> timing_old
> timing_flt
> bigunsignedinttest
> mpiguardtest
> mpihelpertest
> singletontest
> utilitytest
> testfassign_fail1
> testfassign_fail2
> testfassign_fail3
> testfassign_fail4
> testfassign_fail5
> testfassign_fail6
> testfassign1
> testfassign2
> testfassign3
> testfassign4
> smallobject
> conversiontest
> configparsertest
> nullptr-test
> blockbitfieldtest
> deprtuplestest
> fassigntest
> iteratorfacadetest2
> static_assert_test
>
> parametertreetest
> tags
> pathtest
> TAGS
> mpihelpertest2
> testfconstruct
>
>     + Makefile
> Makefile.in
> .deps
> .libs
> semantic.cache
> dynvectortest
> fvectortest
> mpicollcomm
> lrutest
> test-stack
> arraylisttest
> shared_ptrtest
> float_cmp
> bitsetvectortest
> iteratorfacadetest
> sllisttest
> tuplestest
> tupleutilitytest
> enumsettest
> fmatrixtest
> dynmatrixtest
> polyallocator
> poolallocatortest
> *.gcda
> *.gcno
> gmon.out
> gcdlcmtest
> streamtest
> exprtmpl
> timing_xpr
> timing_old
> timing_flt
> bigunsignedinttest
> mpiguardtest
> mpihelpertest
> singletontest
> utilitytest
> testfassign_fail1
> testfassign_fail2
> testfassign_fail3
> testfassign_fail4
> testfassign_fail5
> testfassign_fail6
> testfassign1
> testfassign2
> testfassign3
> testfassign4
> smallobject
> conversiontest
> configparsertest
> nullptr-test
> blockbitfieldtest
> deprtuplestest
> fassigntest
> iteratorfacadetest2
> static_assert_test
>
> parametertreetest
> tags
> pathtest
> TAGS
> mpihelpertest2
>
>
> Modified: branches/release-2.1/dune/common/test/Makefile.am
> ===================================================================
> --- branches/release-2.1/dune/common/test/Makefile.am	2011-03-07 15:27:34 UTC (rev 6386)
> +++ branches/release-2.1/dune/common/test/Makefile.am	2011-03-07 15:32:48 UTC (rev 6387)
> @@ -43,7 +43,6 @@
>       testfassign_fail4 \
>       testfassign_fail5 \
>       testfassign_fail6 \
> -    testfconstruct \
>       tuplestest_dune \
>       tuplestest_std \
>       tuplestest_tr1 \
> @@ -53,7 +52,7 @@
>   # which tests to run
>   COMPILE_XFAIL=$(DUNE_COMMON_BIN)/xfail-compile-tests
>
> -COMPILE_XFAIL_TESTS = genericiterator_compile_fail nullptr-test-fail static_assert_test_fail testfconstruct_fail1 testfconstruct_fail2
> +COMPILE_XFAIL_TESTS = genericiterator_compile_fail nullptr-test-fail static_assert_test_fail
>
>   compile_XFAIL:
>   	for i in $(COMPILE_XFAIL_TESTS); do \
> @@ -201,15 +200,6 @@
>   testfassign_fail6_SOURCES = testfassign.cc
>   testfassign_fail6_CPPFLAGS = $(AM_CPPFLAGS) -D_N=2 -D_M=2 -D_VALUES="1, 2, nextRow, 2, 3, nextRow, 4, 5"
>
> -testfconstruct_SOURCES = testfconstruct.cc
> -testfconstruct_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=3
> -
> -testfconstruct_fail1_SOURCES = testfconstruct.cc
> -testfconstruct_fail1_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=2
> -
> -testfconstruct_fail2_SOURCES = testfconstruct.cc
> -testfconstruct_fail2_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=5
> -
>   conversiontest_SOURCES = conversiontest.cc
>
>   sourcescheck_NOSOURCES = exprtmpl.cc timing.cc
>
> Deleted: branches/release-2.1/dune/common/test/testfconstruct.cc
> ===================================================================
> --- branches/release-2.1/dune/common/test/testfconstruct.cc	2011-03-07 15:27:34 UTC (rev 6386)
> +++ branches/release-2.1/dune/common/test/testfconstruct.cc	2011-03-07 15:32:48 UTC (rev 6387)
> @@ -1,15 +0,0 @@
> -#include<config.h>
> -
> -#include<iostream>
> -#include<dune/common/fvector.hh>
> -#include<dune/common/fassign.hh>
> -
> -using namespace Dune;
> -
> -int main(int argc, char** argv) {
> -  Dune::FieldVector<double,3>  pos;
> -
> -  pos<<= 1, 0, 0;
> -
> -  Dune::FieldVector<float,FVSIZE>  pos2(pos);
> -}
>
>
> _______________________________________________
> Dune-Commit mailing list
> Dune-Commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-commit
>