stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r326682 - /incubator/stdcxx/trunk/include/typeinfo
Date Wed, 19 Oct 2005 20:19:17 GMT
Author: sebor
Date: Wed Oct 19 13:19:13 2005
New Revision: 326682

URL: http://svn.apache.org/viewcvs?rev=326682&view=rev
Log:
2005-10-19  Martin Sebor  <sebor@roguewave.com>

	* typeinfo: Corrected a preprocessor conditional guarding an EDG
	specific #pragma recognized by the vanilla EDG front end, Compaq
	C++, and SGI MIPSpro but not HP aCC 6.x or Intel C++ (which also
	use the same front end).

Modified:
    incubator/stdcxx/trunk/include/typeinfo

Modified: incubator/stdcxx/trunk/include/typeinfo
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/typeinfo?rev=326682&r1=326681&r2=326682&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/typeinfo (original)
+++ incubator/stdcxx/trunk/include/typeinfo Wed Oct 19 13:19:13 2005
@@ -3,20 +3,32 @@
  *
  * typeinfo - declarations for the C++ Standard Library RTTI support
  *
- * $Id: //stdlib/dev/include/typeinfo#46 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Copyright (c) 1994-2005 Quovadx, Inc. All Rights Reserved.
+ * 
+ * This computer software  is owned by Quovadx, Inc.  and is protected by
+ * U.S.  copyright laws  and other  laws and  by  international treaties.
+ * This computer  software is furnished  by Quovadx, Inc., pursuant  to a
+ * written license  agreement and may  be used, copied,  transmitted, and
+ * stored only in accordance with the terms of such license agreement and
+ * with  the inclusion  of  the above  copyright  notice.  This  computer
+ * software or any other copies  thereof may not be provided or otherwise
+ * made available to any other person.
+ * 
+ * 
+ * U.S. Government Restricted Rights.
+ * 
+ * This computer software: (a) was developed at private expense and is in
+ * all respects the proprietary information of Quovadx, Inc.; (b) was not
+ * developed with  government funds;  (c) is a  trade secret  of Quovadx,
+ * Inc. for all purposes of the  Freedom of Information Act; and (d) is a
+ * commercial item  and thus, pursuant  to Section 12.212 of  the Federal
+ * Acquisition  Regulations (FAR) and  DFAR Supplement  Section 227.7202,
+ * Government's use,  duplication or disclosure of  the computer software
+ * is subject to the restrictions set forth by Quovadx, Inc.
  * 
  **************************************************************************/
 
@@ -42,11 +54,12 @@
 
 
 #ifndef _RWSTD_NO_NAMESPACE
-#  if defined (__EDG__) || defined (__sgi) && !defined (__INTEL_COMPILER)
-      // let edg (or its derivative) know about type_info
+#  if    defined (_RWSTD_EDG_ECCP) || defined (_RWSTD_SGI_MIPSPRO) \
+      || defined (__DECCXX)
+      // let EDG (and its derivatives) know about class type_info
       // do not use with Intel C++ on Linux or Windows
 #    pragma define_type_info
-#  endif   // __EDG__ ...
+#  endif   // EDG eccp || Compaq C++ || SGI MIPSpro
 #endif   // _RWSTD_NO_NAMESPACE
 
 



Mime
View raw message