diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2005-03-10 19:47:27 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2005-03-10 19:47:27 +0000 |
| commit | 73ec459d95a08e4dc0956e4892be8e29a2fc754c (patch) | |
| tree | 6a9b9582f9680925dbd7cb5e9b4cebabb426405a | |
| parent | c0a4d5ca072e8fd06bd4ebf1e321c39094eb71ad (diff) | |
| download | ATCD-73ec459d95a08e4dc0956e4892be8e29a2fc754c.tar.gz | |
Thu Mar 10 13:46:21 2005 Will Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/DAnCE/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp | 11 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp | 11 |
3 files changed, 27 insertions, 2 deletions
diff --git a/TAO/CIAO/DAnCE/ChangeLog b/TAO/CIAO/DAnCE/ChangeLog index 168ba0b22a6..38d1b26fb02 100644 --- a/TAO/CIAO/DAnCE/ChangeLog +++ b/TAO/CIAO/DAnCE/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 10 13:46:21 2005 Will Otte <wotte@dre.vanderbilt.edu> + * XMLSchema/Types.hpp + * XSCRT/ExtendedTypeInfo.ipp + + Updated the XSCRT runtime to the latest version to fix warnings + in VC7. + Thu Mar 10 10:29:32 2005 Jaiganesh B <jai@dre.vanderbilt.edu> * Config_Handlers/BasicSP.cdp: diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp b/TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp index 46cee6cbffa..e05e1274a0a 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/XMLSchema/Types.hpp @@ -8,6 +8,14 @@ #include <string> #include <XSCRT/Elements.hpp> +/** + * @@ HACK: VC7 + * + * Disabled the warning about using this in the base member initialization section. + * Our use in this file is fine. + */ +#pragma warning ( disable: 4355 ) + namespace XMLSchema { typedef XSCRT::FundamentalType<signed char> byte; @@ -460,7 +468,8 @@ namespace XMLSchema } IDREF (IDREF const& x) - : id_ (x.id_), id_provider_ (id_) + : XMLSchema::IDREF_Base (), + id_ (x.id_), id_provider_ (id_) { } diff --git a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp index f94da0ede4d..0134e8a090e 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp +++ b/TAO/CIAO/DAnCE/Config_Handlers/XSCRT/ExtendedTypeInfo.ipp @@ -2,6 +2,16 @@ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> // cvs-id : $Id$ + +/* + * @@HACK: Visual Studio. + * I think the return value for operator== for type_info + * in VC7 (perhaps others) is int when is should be bool. + * This causes a warning about converting the return value from + * int to bool. + */ +#pragma warning( disable: 4800 ) + namespace XSCRT { // TypeId @@ -14,7 +24,6 @@ namespace XSCRT { } - inline bool TypeId:: operator == (TypeId const& other) const |