From 9850ed266139718f636331a75db49f9605b62e6a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sun, 25 Mar 2018 20:36:36 +0200 Subject: Remove workarounds for vc6 and old gcc versions * ACE/ace/XML_Utils/XSCRT/Elements.hpp: --- ACE/ace/XML_Utils/XSCRT/Elements.hpp | 138 ----------------------------------- 1 file changed, 138 deletions(-) diff --git a/ACE/ace/XML_Utils/XSCRT/Elements.hpp b/ACE/ace/XML_Utils/XSCRT/Elements.hpp index 9c60b881c36..dcf8844eb65 100644 --- a/ACE/ace/XML_Utils/XSCRT/Elements.hpp +++ b/ACE/ace/XML_Utils/XSCRT/Elements.hpp @@ -322,13 +322,6 @@ namespace XSCRT X x_; }; -#if !((defined (__GNUC__) && (__GNUC__ == 3 && (__GNUC_MINOR__ < 3))) || \ - (defined (__BORLANDC__) && (__BORLANDC__ < 0x620)) || \ - (defined (__SUNPRO_CC) && (__SUNPRO_CC <= 0x5100))) - - // Stuff for normal compilers. - // - // Specialization for `signed char' // // @@ -395,137 +388,6 @@ namespace XSCRT x_ = static_cast (t); } -#else - - // Stuff for broken VC6 & gcc < 3.3. Don't like what you see - use better - // compiler! - // - - // Specialization for signed char. - // - template <> - class FundamentalType : public Type - { - public: - FundamentalType () - { - } - - template - FundamentalType (XML::Element const& e) - { - std::basic_stringstream s; - s << e.value (); - - short t; - s >> t; - - x_ = static_cast (t); - } - - template - FundamentalType (XML::Attribute const& a) - { - std::basic_stringstream s; - s << a.value (); - - short t; - s >> t; - - x_ = static_cast (t); - } - - FundamentalType (signed char const& x) - : x_ (x) - { - } - - FundamentalType& - operator= (signed char const& x) - { - x_ = x; - return *this; - } - - public: - operator signed char const& () const - { - return x_; - } - - operator signed char& () - { - return x_; - } - - protected: - signed char x_; - }; - - // Specialization for unsigned char. - // - template <> - class FundamentalType : public Type - { - public: - FundamentalType () - { - } - - template - FundamentalType (XML::Element const& e) - { - std::basic_stringstream s; - s << e.value (); - - unsigned short t; - s >> t; - - x_ = static_cast (t); - } - - template - FundamentalType (XML::Attribute const& a) - { - std::basic_stringstream s; - s << a.value (); - - unsigned short t; - s >> t; - - x_ = static_cast (t); - } - - FundamentalType (unsigned char const& x) - : x_ (x) - { - } - - FundamentalType& - operator= (unsigned char const& x) - { - x_ = x; - return *this; - } - - public: - operator unsigned char const& () const - { - return x_; - } - - operator unsigned char& () - { - return x_; - } - - protected: - unsigned char x_; - }; - -#endif - - // Specialization for bool. // // -- cgit v1.2.1