diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-07-20 10:32:07 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-07-20 10:32:07 +0000 |
| commit | 2462d1f8f513cb365fa3442c3fb17cbea41aa4f2 (patch) | |
| tree | 69861d5ca0db2abbbacbb8886e9fc9aa59d1f9a2 | |
| parent | 8ccaddc6c4e7709b4d2bfe67b1ff532814471b28 (diff) | |
| download | ATCD-2462d1f8f513cb365fa3442c3fb17cbea41aa4f2.tar.gz | |
Mon Jul 20 10:32:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tools/Config_Handlers/XSCRT/Elements.hpp:
Removed old msvc checks
| -rw-r--r-- | CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | CIAO/tools/Config_Handlers/XSCRT/Elements.hpp | 45 |
2 files changed, 6 insertions, 44 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 3f8562635af..c7469acc27b 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 20 10:32:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tools/Config_Handlers/XSCRT/Elements.hpp: + Removed old msvc checks + Mon Jul 20 07:02:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/ComponentServer/Configurators/Server_Configurator.cpp: diff --git a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp index 53696b96feb..2f14dcae7e2 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp +++ b/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp @@ -13,49 +13,6 @@ #include <XSCRT/Parser.hpp> #include "ace/Refcounted_Auto_Ptr.h" -#if defined (_MSC_VER) && (_MSC_VER < 1300) - -// Stuff for broken VC6. Don't like what you see - use better compiler! -// - -inline -std::wistream& -operator>> (std::wistream& is, __int64& v) -{ - long t; - is >> t; - v = t; - return is; -} - -inline -std::wistream& -operator>> (std::wistream& is, unsigned __int64& v) -{ - unsigned long t; - is >> t; - v = t; - return is; -} - -inline -std::wostream& -operator<< (std::wostream& os, __int64 const& v) -{ - os << long (v); - return os; -} - -inline -std::wostream& -operator<< (std::wostream& os, unsigned __int64 const& v) -{ - os << unsigned long (v); - return os; -} - -#endif - namespace XSCRT { struct IdentityProvider @@ -332,7 +289,7 @@ namespace XSCRT X x_; }; -#if (!defined (_MSC_VER) || (_MSC_VER >= 1300)) && \ +#if (!defined (_MSC_VER)) && \ (__GNUC__ > 3 || (__GNUC__ == 3 && (__GNUC_MINOR__ > 2))) |