diff options
| author | sbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-18 23:07:07 +0000 |
|---|---|---|
| committer | sbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-18 23:07:07 +0000 |
| commit | 110a6db257400c955380f191f625a2c477a0d40c (patch) | |
| tree | 39dc5d773f225a8a5e0057068db4c2307df569ed | |
| parent | aacb5e74c7ab5a7570f5dc4c9559d89aef94f490 (diff) | |
| download | ATCD-110a6db257400c955380f191f625a2c477a0d40c.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader.h | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index 01c792ec1a4..db03a65df31 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -260,7 +260,7 @@ char * yyreds[] = * Copyright (c) 1993 by Sun Microsystems, Inc. */ -#pragma ident "@(#)yaccpar 6.12 93/06/07 SMI" +//#pragma ident "@(#)yaccpar 6.12 93/06/07 SMI" /* ** Skeleton parser driver for yacc output diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index ce416fc9b1c..61b94c99be0 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -22,6 +22,10 @@ #include "ace/Hash_Map_Manager.h" #include "Attributes.h" +#if defined(_MSC_VER) +#pragma warning(disable:4250) +#endif /* _MSC_VER */ + // Forward Declaration. class TAO_Trader_Base; @@ -149,4 +153,8 @@ operator< (const CosTradingRepos::ServiceTypeRepository::IncarnationNumber &l, const CosTradingRepos::ServiceTypeRepository::IncarnationNumber &r); +#if defined(_MSC_VER) +#pragma warning(default:4250) +#endif /* _MSC_VER */ + #endif /* TAO_TRADER_BASE_H */ |