Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Integer template specializations: use builtin types instead of stdint #354

Merged
merged 1 commit into from
Feb 24, 2016
Merged

Integer template specializations: use builtin types instead of stdint #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 28 additions & 21 deletions utility/convert.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,35 +52,43 @@ struct ConvertionAllowed<bool> : std::true_type
{
};
template <>
struct ConvertionAllowed<uint64_t> : std::true_type
struct ConvertionAllowed<long long> : std::true_type
{
};
template <>
struct ConvertionAllowed<int64_t> : std::true_type
struct ConvertionAllowed<unsigned long long> : std::true_type
{
};
template <>
struct ConvertionAllowed<uint32_t> : std::true_type
struct ConvertionAllowed<long> : std::true_type
{
};
template <>
struct ConvertionAllowed<int32_t> : std::true_type
struct ConvertionAllowed<unsigned long> : std::true_type
{
};
template <>
struct ConvertionAllowed<uint16_t> : std::true_type
struct ConvertionAllowed<int> : std::true_type
{
};
template <>
struct ConvertionAllowed<int16_t> : std::true_type
struct ConvertionAllowed<unsigned int> : std::true_type
{
};
template <>
struct ConvertionAllowed<int8_t> : std::true_type
struct ConvertionAllowed<short> : std::true_type
{
};
template <>
struct ConvertionAllowed<uint8_t> : std::true_type
struct ConvertionAllowed<unsigned short> : std::true_type
{
};
template <>
struct ConvertionAllowed<unsigned char> : std::true_type
{
};
template <>
struct ConvertionAllowed<signed char> : std::true_type
{
};
template <>
Expand All @@ -98,11 +106,11 @@ struct ConvertionAllowedVia : std::false_type
{
};
template <>
struct ConvertionAllowedVia<uint8_t, uint32_t> : std::true_type
struct ConvertionAllowedVia<unsigned char, unsigned int> : std::true_type
{
};
template <>
struct ConvertionAllowedVia<int8_t, int32_t> : std::true_type
struct ConvertionAllowedVia<signed char, int> : std::true_type
{
};

Expand Down Expand Up @@ -191,16 +199,16 @@ static inline bool convertTo(const std::string &str, T &result)
return details::convertTo<T>(str, result);
}

/** Specialization for uint8_t of convertTo template function.
/** Specialization for unsigned char of convertTo template function.
*
* This function follows the same paradigm than it's generic version.
*
* The generic version was converting int8 as it was a character
* (uint8_t is an alias to unsigned char on most compiler).
* The generic version was converting char as it was a character
* (unsigned char is an alias to unsigned char on most compiler).
* Thus converting "1" would return 49 ie '1'.
* As convertTo is thought as an _numerical_ convertion tool
* (contrary to boost::lexical_cast for example),
* forbid considering the input as a character and consider uint8_t
* forbid considering the input as a character and consider unsigned char
* (aka unsigned char) as a number exclusively.
*
* @param[in] str the string to parse.
Expand All @@ -209,21 +217,20 @@ static inline bool convertTo(const std::string &str, T &result)
* @return true if conversion was successful, false otherwise.
*/
template <>
inline bool convertTo<uint8_t>(const std::string &str, uint8_t &result)
inline bool convertTo<unsigned char>(const std::string &str, unsigned char &result)
{
return details::convertToVia<uint8_t, uint32_t>(str, result);
return details::convertToVia<unsigned char, unsigned int>(str, result);
}

/** Specialization for int8_t of convertTo template function.
/** Specialization for signed char of convertTo template function.
*
* @see convertTo<uint8_t>
* @see convertTo<unsigned char>
*/
template <>
inline bool convertTo<int8_t>(const std::string &str, int8_t &result)
inline bool convertTo<signed char>(const std::string &str, signed char &result)
{
return details::convertToVia<int8_t, int32_t>(str, result);
return details::convertToVia<signed char, int>(str, result);
}

/**
* Specialization for float of convertTo template function.
*
Expand Down
26 changes: 18 additions & 8 deletions xmlserializer/XmlElement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,17 +265,27 @@ bool CXmlElement::CChildIterator::next(CXmlElement &xmlChildElement)
}

template bool CXmlElement::getAttribute(const std::string &name, std::string &value) const;
template bool CXmlElement::getAttribute(const std::string &name, uint16_t &value) const;
template bool CXmlElement::getAttribute(const std::string &name, uint32_t &value) const;
template bool CXmlElement::getAttribute(const std::string &name, int32_t &value) const;
template bool CXmlElement::getAttribute(const std::string &name, uint64_t &value) const;
template bool CXmlElement::getAttribute(const std::string &name, bool &value) const;
template bool CXmlElement::getAttribute(const std::string &name, double &value) const;
template bool CXmlElement::getAttribute(const std::string &name, short &value) const;
template bool CXmlElement::getAttribute(const std::string &name, unsigned short &value) const;
template bool CXmlElement::getAttribute(const std::string &name, int &value) const;
template bool CXmlElement::getAttribute(const std::string &name, unsigned int &value) const;
template bool CXmlElement::getAttribute(const std::string &name, long &value) const;
template bool CXmlElement::getAttribute(const std::string &name, unsigned long &value) const;
template bool CXmlElement::getAttribute(const std::string &name, long long &value) const;
template bool CXmlElement::getAttribute(const std::string &name, unsigned long long &value) const;
template bool CXmlElement::getAttribute(const std::string &name, float &value) const;
template bool CXmlElement::getAttribute(const std::string &name, double &value) const;

template void CXmlElement::setAttribute(const std::string &name, const std::string &value);
template void CXmlElement::setAttribute(const std::string &name, const bool &value);
template void CXmlElement::setAttribute(const std::string &name, const int32_t &value);
template void CXmlElement::setAttribute(const std::string &name, const uint32_t &value);
template void CXmlElement::setAttribute(const std::string &name, const uint64_t &value);
template void CXmlElement::setAttribute(const std::string &name, const short &value);
template void CXmlElement::setAttribute(const std::string &name, const unsigned short &value);
template void CXmlElement::setAttribute(const std::string &name, const int &value);
template void CXmlElement::setAttribute(const std::string &name, const unsigned int &value);
template void CXmlElement::setAttribute(const std::string &name, const long &value);
template void CXmlElement::setAttribute(const std::string &name, const unsigned long &value);
template void CXmlElement::setAttribute(const std::string &name, const long long &value);
template void CXmlElement::setAttribute(const std::string &name, const unsigned long long &value);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please symmetrizing the set and get supported type.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

template void CXmlElement::setAttribute(const std::string &name, const float &value);
template void CXmlElement::setAttribute(const std::string &name, const double &value);