new release

This commit is contained in:
2018-12-14 15:54:11 +01:00
parent 52fe50f14a
commit b09186294d
92 changed files with 399213 additions and 269856 deletions

View File

@@ -19,21 +19,18 @@
template<typename T>
struct enumStrings
{
struct enumStrings {
static char const* data[];
};
template<typename T>
struct enumRefHolder
{
struct enumRefHolder {
T& enumVal;
enumRefHolder(T& enumVal): enumVal(enumVal) {}
};
template<typename T>
struct enumConstRefHolder
{
struct enumConstRefHolder {
T const& enumVal;
enumConstRefHolder(T const& enumVal): enumVal(enumVal) {}
};
@@ -48,7 +45,7 @@ inline std::ostream& operator<<(std::ostream& str, enumConstRefHolder<T> const&
}
else {
return str << "ERROR: enumStrings.h reports data.enumVal= " << data.enumVal
<< " DOES NOT HAVE A STRING EQUIVALENT!";
<< " DOES NOT HAVE A STRING EQUIVALENT!";
}
}
@@ -68,18 +65,17 @@ inline std::istream& operator>>(std::istream& str, enumRefHolder<T> const& data)
//if (find != end)
if ( std::find( boost::begin(enumStrings<T>::data), boost::end( enumStrings<T>::data), value) !=
boost::end( enumStrings<T>::data))
{
boost::end( enumStrings<T>::data)) {
//data.enumVal = static_cast<T>(std::distance(begin, find));
data.enumVal = static_cast<T>(std::distance(boost::begin(enumStrings<T>::data),
std::find (boost::begin(enumStrings<T>::data), boost::end(enumStrings<T>::data), value ) ));
std::find (boost::begin(enumStrings<T>::data), boost::end(enumStrings<T>::data), value ) ));
}
if (data.enumVal > boost::size( enumStrings<T>::data) ) {
std::cout << "ERROR: enumStrings.h reports data.enumVal = " << data.enumVal
<< " is out of enum range = " << boost::size( enumStrings<T>::data) << std::endl;
<< " is out of enum range = " << boost::size( enumStrings<T>::data) << std::endl;
}
return str;
@@ -87,10 +83,16 @@ inline std::istream& operator>>(std::istream& str, enumRefHolder<T> const& data)
template<typename T>
enumConstRefHolder<T> enumToString(T const& e) {return enumConstRefHolder<T>(e);}
enumConstRefHolder<T> enumToString(T const& e)
{
return enumConstRefHolder<T>(e);
}
template<typename T>
enumRefHolder<T> enumFromString(T& e) {return enumRefHolder<T>(e);}
enumRefHolder<T> enumFromString(T& e)
{
return enumRefHolder<T>(e);
}