Skip to content
Snippets Groups Projects
Commit 68ab6aae authored by Markus Blatt's avatar Markus Blatt
Browse files

Merged the following bugfixes from the trunk:

6759,6791,6798,6816,6818,6819,6822:6861,6865,6867,6874,6875,6881,6882,6883,6884\
,6885,6895,6897,6913,6914,6915,6929,6949,6952,6953,6954,6980,6983,7040,7041,704\
2,7043,7045,7046,7047,7049,7053,7057,7058

Here are the corresponding log messages for clarity:

> ------------------------------------------------------------------------
> r6759 | christi | 2012-05-23 11:32:42 +0200 (Mi, 23. Mai 2012) | 2 Zeilen
> 
> [am]
> always install doxygen files, even if we didn't generate them
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6791 | gruenich | 2012-06-05 14:27:48 +0200 (Di, 05. Jun 2012) | 4 Zeilen
> 
> mpitraits.hh forward declares std::pair, which is illegal by the standard, and clang stumbles over that.
> Fixes FS#1121.
> (Thanks to Steffen Müting for the patch)
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6798 | christi | 2012-06-12 17:09:26 +0200 (Di, 12. Jun 2012) | 1 Zeile
> 
> make sure the error message is quoted
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6816 | mblatt | 2012-06-25 12:00:58 +0200 (Mo, 25. Jun 2012) | 2 Zeilen
> 
> Avoid -Wshadow warning in dune/common/exceptions
> Patch contributed by Matthias Wohlmuth
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6818 | christi | 2012-07-06 13:54:45 +0200 (Fr, 06. Jul 2012) | 2 Zeilen
> 
> [m4]
> fix typo in ax_boost_base (thanks to Bård Skaflestad for the patch)
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6819 | sander | 2012-07-06 16:32:22 +0200 (Fr, 06. Jul 2012) | 4 Zeilen
> 
> Make sure infinity_norm of a matrix with all NaN entries is NaN
> 
> This fixes FS 1147.  Thanks to Elias Pipping for the patch.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6822 | mnolte | 2012-07-07 18:19:31 +0200 (Sa, 07. Jul 2012) | 2 Zeilen
> 
> merge trunk
> 
> ------------------------------------------------------------------------
> r6823 | christi | 2012-07-08 23:47:18 +0200 (So, 08. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> * smaller cleanups
> * remove unsused methods
> ------------------------------------------------------------------------
> r6824 | christi | 2012-07-08 23:47:23 +0200 (So, 08. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> - fix check_module_name
> - make it faster by using a pure bash-pattern-matching
> ------------------------------------------------------------------------
> r6825 | christi | 2012-07-08 23:47:28 +0200 (So, 08. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> bug fix and further cleanup in dunemodules.lib
> ------------------------------------------------------------------------
> r6826 | christi | 2012-07-08 23:47:32 +0200 (So, 08. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> fix tracking of already parsed modules
> ... results in a significantly speedup
> ------------------------------------------------------------------------
> r6827 | christi | 2012-07-08 23:47:38 +0200 (So, 08. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> fix whitespace match for awk
> ------------------------------------------------------------------------
> r6828 | christi | 2012-07-08 23:47:43 +0200 (So, 08. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> avoid ${var} expression, $var is slightly faster
> ------------------------------------------------------------------------
> r6829 | christi | 2012-07-08 23:47:46 +0200 (So, 08. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> alternative implementation for fix_variable_name,
> avoiding invocation of tr
> ------------------------------------------------------------------------
> r6830 | christi | 2012-07-08 23:47:50 +0200 (So, 08. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> use bash string substitution instead of sed
> ------------------------------------------------------------------------
> r6831 | christi | 2012-07-08 23:47:53 +0200 (So, 08. Jul 2012) | 4 Zeilen
> 
> [dunecontrol]
> - factor out check and version check of dependencies
> - reuse for suggestions
> - make versioned suggestions work
> ------------------------------------------------------------------------
> r6832 | christi | 2012-07-08 23:57:52 +0200 (So, 08. Jul 2012) | 1 Zeile
> 
> buildsystem cleanup
> ------------------------------------------------------------------------
> r6833 | christi | 2012-07-09 01:50:41 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> for some straneg reason the variable module can not be local...
> ------------------------------------------------------------------------
> r6834 | christi | 2012-07-09 01:50:45 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> fix DEPS and SUGS check invocation
> ------------------------------------------------------------------------
> r6835 | christi | 2012-07-09 02:39:30 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> remove unused code
> ------------------------------------------------------------------------
> r6836 | christi | 2012-07-09 02:39:33 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> avoid parsing suggestions twice
> ------------------------------------------------------------------------
> r6837 | christi | 2012-07-09 02:39:37 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> remove obsolete assignment
> ------------------------------------------------------------------------
> r6838 | christi | 2012-07-09 02:39:40 +0200 (Mo, 09. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> bug fix in m4create:
> - the current module is stored in $mainmod, not $module
> ------------------------------------------------------------------------
> r6839 | christi | 2012-07-09 02:39:43 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunemodule]
> export module name to make --current work properly again
> ------------------------------------------------------------------------
> r6840 | christi | 2012-07-09 02:39:46 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> make m4create work with versioned suggestions
> ------------------------------------------------------------------------
> r6841 | christi | 2012-07-09 12:17:34 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> replay FOUNDMODULES when calling find_modules_in_path a second time
> ------------------------------------------------------------------------
> r6842 | christi | 2012-07-09 12:17:37 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> fix reset of SORT_*_DONE_* flags after changing the naming scheme
> ------------------------------------------------------------------------
> r6843 | christi | 2012-07-09 12:17:41 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> fix broken assignment after changing the naming of SORT_*_DONE_*
> ------------------------------------------------------------------------
> r6844 | christi | 2012-07-09 12:17:45 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> put path into double-ticks to allow spaces etc.
> ------------------------------------------------------------------------
> r6845 | christi | 2012-07-09 12:17:48 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> set full path for dependencies.m4
> ------------------------------------------------------------------------
> r6846 | christi | 2012-07-09 12:17:52 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> report about suggestions
> ------------------------------------------------------------------------
> r6847 | christi | 2012-07-09 14:02:47 +0200 (Mo, 09. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> sorting modules:
> distinguish between the MAIN pass and DEPS/SUGS
> ------------------------------------------------------------------------
> r6848 | christi | 2012-07-09 15:15:07 +0200 (Mo, 09. Jul 2012) | 4 Zeilen
> 
> [dunecontrol]
> refactored _check_deps handled missing SUGS as fatal error.
> now we just ignore SUSG which are not present or don't match the
> required version
> ------------------------------------------------------------------------
> r6849 | christi | 2012-07-09 15:15:11 +0200 (Mo, 09. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> add support to run the dependencies in revers order
> (necessarry for "make distclean")
> ------------------------------------------------------------------------
> r6850 | christi | 2012-07-09 15:16:48 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> tell the user that we skip a suggestion
> ------------------------------------------------------------------------
> r6851 | christi | 2012-07-09 18:42:02 +0200 (Mo, 09. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> don't stop the dependency tracking if suggestion is missing,
> just skip this single entry
> ------------------------------------------------------------------------
> r6852 | christi | 2012-07-09 18:55:01 +0200 (Mo, 09. Jul 2012) | 2 Zeilen
> 
> [doxygen]
> don't try to install doxygen when documentation is disabled
> ------------------------------------------------------------------------
> r6853 | christi | 2012-07-10 14:36:14 +0200 (Di, 10. Jul 2012) | 3 Zeilen
> 
> [headercheck]
> print warnings, but continue compilation
> (thanks to Tobias Malkmus)
> ------------------------------------------------------------------------
> r6854 | christi | 2012-07-10 14:36:18 +0200 (Di, 10. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> remove debug output
> ------------------------------------------------------------------------
> r6855 | christi | 2012-07-10 14:42:33 +0200 (Di, 10. Jul 2012) | 4 Zeilen
> 
> [dunecontrol]
> just search any module (dependencies and suggestions)
> and do the splitting of DEPS and SUGS list afterwards
> => make sure a module is not listed twice
> ------------------------------------------------------------------------
> r6856 | christi | 2012-07-10 14:42:37 +0200 (Di, 10. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> cleaner eval/test statements
> ------------------------------------------------------------------------
> r6857 | christi | 2012-07-10 14:42:40 +0200 (Di, 10. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> documentation for _search_module
> ------------------------------------------------------------------------
> r6858 | christi | 2012-07-10 19:37:28 +0200 (Di, 10. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> only update the module mode if it not DEPS, which is the
> ------------------------------------------------------------------------
> r6859 | christi | 2012-07-10 19:49:49 +0200 (Di, 10. Jul 2012) | 2 Zeilen
> 
> [dunecontrol]
> actually depmode and mainmode where the same... only compute one of them
> ------------------------------------------------------------------------
> r6860 | christi | 2012-07-10 19:49:53 +0200 (Di, 10. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> add an option to print the sorted list of modules, including the info
> if it is a dependency or a suggestion
> ------------------------------------------------------------------------
> r6861 | christi | 2012-07-11 10:06:57 +0200 (Mi, 11. Jul 2012) | 3 Zeilen
> 
> [dunecontrol]
> fix verbose suggestions output
> (thanks to Tobias Malkmus)
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6865 | gruenich | 2012-07-13 14:20:31 +0200 (Fr, 13. Jul 2012) | 4 Zeilen
> 
> [array]
> Fix printing of zero-dimensional arrays, FS#1148.
> (Thanks to Elias Pipping for testing the patch)
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6867 | gruenich | 2012-07-16 11:12:42 +0200 (Mo, 16. Jul 2012) | 2 Zeilen
> 
> Element in sllist.hh is a struct, not a class.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6874 | mblatt | 2012-07-26 21:49:02 +0200 (Do, 26. Jul 2012) | 3 Zeilen
> 
> Slightly modified patch by Andreas Lauser. (requiring metis is an
> error as it would have halted configure)
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6875 | mblatt | 2012-07-27 10:26:31 +0200 (Fr, 27. Jul 2012) | 2 Zeilen
> 
> Moved call to ParMETIS test outside of the conditional. Fixes flyspray #1163.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6881 | christi | 2012-08-06 11:38:04 +0200 (Mo, 06. Aug 2012) | 2 Zeilen
> 
> [dunecontrol]
> improve error message for invalid module names
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6882 | christi | 2012-08-06 11:38:08 +0200 (Mo, 06. Aug 2012) | 3 Zeilen
> 
> [am]
> fix out-of-source build for latex and wml
> -> fix oos-build for dune-grid-howto
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6883 | christi | 2012-08-06 11:38:11 +0200 (Mo, 06. Aug 2012) | 2 Zeilen
> 
> [am]
> remove dune-web support from top-rules
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6884 | christi | 2012-08-06 11:38:13 +0200 (Mo, 06. Aug 2012) | 2 Zeilen
> 
> [Makefile.am]
> fix include order
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6885 | christi | 2012-08-06 14:21:46 +0200 (Mo, 06. Aug 2012) | 3 Zeilen
> 
> [am]
> oos-build broke the web-site
> this fix actually checks where the sources are chooses the right directory
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6895 | christi | 2012-08-12 18:59:52 +0200 (So, 12. Aug 2012) | 2 Zeilen
> 
> [parametertree]
> add doc
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6897 | mnolte | 2012-08-13 13:31:55 +0200 (Mo, 13. Aug 2012) | 2 Zeilen
> 
> merge rev. 6896 from my development branch
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6913 | sander | 2012-08-21 16:38:37 +0200 (Di, 21. Aug 2012) | 6 Zeilen
> 
> Compare container sizes instead of iterators to help the optimizer
> 
> As suggested by Christian in FS 1147.
> 
> Implemented by Elias Pipping.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6914 | sander | 2012-08-21 16:46:15 +0200 (Di, 21. Aug 2012) | 6 Zeilen
> 
> Make sure infinity_norm returns NaN if a DenseVector contains NaN exclusively
> 
> Patch by Elias Pipping, thanks.
> 
> FS 1147
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6915 | sander | 2012-08-21 16:48:47 +0200 (Di, 21. Aug 2012) | 4 Zeilen
> 
> Fix bug in infinity_norm_real introduced by previous patch.
> 
> Patch by Elias Pipping
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6929 | mnolte | 2012-08-26 19:25:26 +0200 (So, 26. Aug 2012) | 2 Zeilen
> 
> implement scan and partualSum (MPI_SCAN)
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6949 | mblatt | 2012-08-31 16:43:59 +0200 (Fr, 31. Aug 2012) | 16 Zeilen
> 
> Order matters when providing libs. All symbols used by a library must
> have been already seen by the linker. As DUNE_LIBS (e.g. dune-grid)
> use symbols from other libraries already in ALL_PKG_LIBS (e.g. those of the
> alugrid library), they should be appended to them.
> 
> On the other hand libtool removes duplicate libraries provided when
> linking from, such that only the first occurence persits. Resulting
> e.g. in libalugrid coming after libgrid.
> 
> This never caused problems because libtool added dependencies known to
> it from the .la file automatically. But it does when using dune core
> packages built with cmake (these lack .la files).
> 
> All tests of the core module pass (except one in virtual
> refinement). Additionally dune-grid-howto build with ug and alugrid enabled.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6952 | joe | 2012-09-03 11:26:09 +0200 (Mo, 03. Sep 2012) | 1 Zeile
> 
> [hdf5.m4] Improve comment.
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6953 | joe | 2012-09-03 11:26:10 +0200 (Mo, 03. Sep 2012) | 1 Zeile
> 
> [DUNE_ADD_ALL_PKG] Document usage better, and correctly use it in hdf5.m4.
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6954 | joe | 2012-09-03 11:26:12 +0200 (Mo, 03. Sep 2012) | 2 Zeilen
> 
> [hdf5.m4] Make it possible to use the results of DUNE_PATH_HDF5 later during
> configure, even if MPI was found.
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6980 | mblatt | 2012-09-05 19:50:13 +0200 (Mi, 05. Sep 2012) | 4 Zeilen
> 
> Fixed flyspray 1066.
> Fixed some bugs in the documentation.
> (This is revision 6977 all over again, but with the correct commit message.)
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r6983 | mnolte | 2012-09-07 09:42:35 +0200 (Fr, 07. Sep 2012) | 2 Zeilen
> 
> documentation: const_iterator is a constant iterator, not a mutable one
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7040 | christi | 2012-10-17 23:08:39 +0200 (Mi, 17. Okt 2012) | 3 Zeilen
> 
> [shared_ptr]
> test initialization from nullptr
> fix bool cast of Dune implementation
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7041 | christi | 2012-10-18 00:18:36 +0200 (Do, 18. Okt 2012) | 1 Zeile
> 
> remove keyword explicit for the bool cast of shared_ptr
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7042 | mblatt | 2012-10-19 17:56:03 +0200 (Fr, 19. Okt 2012) | 2 Zeilen
> 
> Use the libs as documented in ax_lapack.m4 for linking.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7043 | mblatt | 2012-10-19 17:58:21 +0200 (Fr, 19. Okt 2012) | 3 Zeilen
> 
> Merged patch from cmake branch.
> (Support type conversion for shared_ptr. Needed for gcc-4.1.)
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7045 | mblatt | 2012-10-21 14:08:49 +0200 (So, 21. Okt 2012) | 3 Zeilen
> 
> Added constructor from nullptr.
> Make test runs through again.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7046 | mblatt | 2012-10-21 18:14:21 +0200 (So, 21. Okt 2012) | 13 Zeilen
> 
> Support counting even if the pointer type is converted to a compatible
> base class.
> 
> Previously
> 
> class A{};
> class B: public A{};
> 
> shared_ptr<A> b(new B);
> shared_ptr<B> b(a);
> 
> b.get_count()==1 && b.get_count()==1 would wrongly hold true.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7047 | mblatt | 2012-10-21 18:20:14 +0200 (So, 21. Okt 2012) | 15 Zeilen
> 
> Missing patch to shared_ptr.hh from last commit.
> 
> Support counting even if the pointer type is converted to a compatible
> base class.
> 
> Previously
> 
> class A{};
> class B: public A{};
> 
> shared_ptr<A> b(new B);
> shared_ptr<B> b(a);
> 
> b.get_count()==1 && b.get_count()==1 would wrongly hold true.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7049 | mblatt | 2012-10-22 13:12:13 +0200 (Mo, 22. Okt 2012) | 4 Zeilen
> 
> Fixed __unspecified_bool_type(). 
> Forced initializing to zero.
> Compiles with clang again.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7053 | mblatt | 2012-11-02 13:40:14 +0100 (Fr, 02. Nov 2012) | 2 Zeilen
> 
> Removed unnecessary memory allocations from shared_ptr together with some memory leaks.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7057 | gruenich | 2012-11-10 08:10:42 +0100 (Sa, 10. Nov 2012) | 5 Zeilen
> 
> [gmp.m4]
> Add check for libgmpxx.
> It should not happen but I had the problem with two systems (Mac OS X
> and Hermit XE6) that gmpxx.hh was found but no libgmpxx.
> 
> ------------------------------------------------------------------------
> ------------------------------------------------------------------------
> r7058 | gruenich | 2012-11-11 09:17:08 +0100 (So, 11. Nov 2012) | 2 Zeilen
> 
> [gmp.m4] Add support for configure caching.
> 
> ------------------------------------------------------------------------

[[Imported from SVN: r7077]]
No related branches found
No related tags found
No related merge requests found
Showing with 512 additions and 324 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment