Merge remote-tracking branch 'origin/master'

# Conflicts:
#	enum_type.h
This commit is contained in:
John Wellbelove 2015-10-10 16:58:32 +01:00
commit b7fb3385e8

View File

@ -72,7 +72,7 @@ SOFTWARE.
/// std::cout << "Direction = " << direction.c_str(); // Prints "Direction = North"
///\endcode
/// If a conversion to a string is not required then the 'ENUM_TYPE' declaration may be omitted.
/// In that case the c_str() function will return a "?". This will also be the case for any
/// In that case the c_str() function will return a "?". This will also be the case for any
/// enumeration value that does not have an ENUM_TYPE entry.
///\ingroup utilities