# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

# Conflicts:
#	dune/stuff/test/common_string.cc

Throwing and #error in this case generated a hard dependency
on istl or eigen. Therefore introdocue a default that'll
generate an error only if it's instantiated.

Throwing and #error in this case generated a hard dependency
on istl or eigen. Therefore introdocue a default that'll
generate an error only if it's instantiated.

grid related improvements

# Conflicts:
#	dune/stuff/test/CMakeLists.txt

closes #57

closes #57

Fix some errors when HAVE_TBB is false

Fix some warnings

This reverts commit 55d7df3a6353949522e1758b6b5fd9c7baba0ba4.

Thread-safe expression function

Remove entityptr from periodicview

Merge branch 'master' of https://github.com/wwu-numerik/dune-stuff into remove_entityptr_from_periodicview

Conflicts:
	dune/stuff/grid/periodicview.hh
	dune/stuff/test/grid_periodicview.cc

Conflicts:
	dune/stuff/functions/expression.hh