From 81ebe31f11d23d9ef7522c18c30e0525aea9e30c Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 19 Jun 2006 12:11:39 +0000 Subject: [PATCH] INTEGRATION: CWS warnings01 (1.14.4); FILE MERGED 2006/04/07 17:49:40 sb 1.14.4.3: RESYNC: (1.15-1.16); FILE MERGED 2006/01/25 17:55:43 sb 1.14.4.2: RESYNC: (1.14-1.15); FILE MERGED 2005/10/07 06:39:31 sb 1.14.4.1: #i53898# Removed non-working consistency check. --- cppu/inc/uno/lbnames.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h index 4e585b436727..1a1522107e02 100644 --- a/cppu/inc/uno/lbnames.h +++ b/cppu/inc/uno/lbnames.h @@ -4,9 +4,9 @@ * * $RCSfile: lbnames.h,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2006-03-06 10:16:36 $ + * last change: $Author: hr $ $Date: 2006-06-19 13:11:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -84,11 +84,6 @@ provoking error here, because PP ignores #error #endif #ifdef CPPU_ENV -/* test: whether given CPPU_ENV matches expected one */ -#if (CPPU_ENV != TMP_CPPU_ENV) -#error "CPPU_ENV: unexpected env!" -provoking error here, because PP ignores #error -#endif #define CPPU_STRINGIFY_EX( x ) #x #define CPPU_STRINGIFY( x ) CPPU_STRINGIFY_EX( x ) @@ -97,8 +92,10 @@ provoking error here, because PP ignores #error #define CPPU_CURRENT_LANGUAGE_BINDING_NAME CPPU_STRINGIFY( CPPU_ENV ) #else + #error "No supported C++ compiler environment." provoking error here, because PP ignores #error + #endif /* CPPU_ENV */ #undef TMP_CPPU_ENV