And use it in the test.

This patch uses the new 'constexpr' macro.  Hence it is C++11 only.

[[Imported from SVN: r9195]]