minor changes:

minor changes:

    * dynamic exception specifications are deprecated in C++11 (throw on
function definition)
    * INSTANTIATE_TEST_CASE_P gives a warning about variadic arguments
having at least one argument. The IntToString functor is what it
requires for test cases to be displayed correctly.
    * Options should be merged with formatted option included in the
identifier. This was unit-tested, but masked by an incorrect csv-format
value in test data. Merge not used in actual code, but used in
Cassandra PR.
    * ifdefs in MACROS are not portable
    * added missing doxygen comments