From cb876a28a139ad01e6a357f3e939df0bba1f643b Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Tue, 20 Mar 2001 16:32:24 -0500 Subject: [svn-r3677] Purpose: Bug fix (sort of) Description: The RCSID string in H5public.h was causing the C++ code problem as it was included multiple times and C++ did not like multiple definitions of the same static variable. Solution: Since we don't really make use of the RCSID strings as we have not installed it in all source files, we decided to remove it. Platforms tested: eirene (linux), modi4 (IRIX64-64) both serial and parallel modes. --- src/H5.c | 4 ---- src/H5A.c | 4 ---- src/H5D.c | 4 ---- src/H5F.c | 4 ---- src/H5I.c | 4 ---- src/H5Oattr.c | 4 ---- src/H5Odtype.c | 4 ---- src/H5Osdspace.c | 4 ---- src/H5P.c | 4 ---- src/H5R.c | 4 ---- src/H5S.c | 4 ---- src/H5T.c | 3 --- src/H5TB.c | 4 ---- src/H5TS.c | 4 ---- src/H5Tvlen.c | 4 ---- src/H5public.h | 4 ---- test/tarray.c | 4 ---- test/tattr.c | 4 ---- test/testhdf5.c | 4 ---- test/tfile.c | 4 ---- test/tgenprop.c | 4 ---- test/th5s.c | 4 ---- test/titerate.c | 4 ---- test/tmeta.c | 4 ---- test/trefer.c | 4 ---- test/tselect.c | 4 ---- test/ttbbt.c | 4 ---- test/ttime.c | 4 ---- test/ttsafe.c | 4 ---- test/tvlstr.c | 4 ---- test/tvltypes.c | 4 ---- 31 files changed, 123 deletions(-) diff --git a/src/H5.c b/src/H5.c index cd9c6b9..5bcb5df 100644 --- a/src/H5.c +++ b/src/H5.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ /* private headers */ diff --git a/src/H5A.c b/src/H5A.c index 65443aa..1d63594 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ #define H5A_PACKAGE /*suppress error about including H5Apkg */ diff --git a/src/H5D.c b/src/H5D.c index 15f2f54..c6b3e3b 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ #include /* Generic Functions */ diff --git a/src/H5F.c b/src/H5F.c index 8767e6b..62c16e8 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -14,10 +14,6 @@ * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ diff --git a/src/H5I.c b/src/H5I.c index 817b273..79a21b0 100644 --- a/src/H5I.c +++ b/src/H5I.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ /* diff --git a/src/H5Oattr.c b/src/H5Oattr.c index 7ffd804..65cb4bf 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ #define H5A_PACKAGE /*prevent warning from including H5Tpkg.h */ diff --git a/src/H5Odtype.c b/src/H5Odtype.c index d5b7618..398e5cb 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ #define H5T_PACKAGE /*prevent warning from including H5Tpkg.h */ diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index a2829ef..8dab984 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ #define H5S_PACKAGE /*prevent warning from including H5Spkg.h */ diff --git a/src/H5P.c b/src/H5P.c index 61b4bfd..aa23d1e 100644 --- a/src/H5P.c +++ b/src/H5P.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ /* Private header files */ diff --git a/src/H5R.c b/src/H5R.c index cd28331..495eb32 100644 --- a/src/H5R.c +++ b/src/H5R.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ diff --git a/src/H5S.c b/src/H5S.c index 04b4913..e0213a4 100644 --- a/src/H5S.c +++ b/src/H5S.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ #define H5S_PACKAGE /*suppress error about including H5Spkg */ diff --git a/src/H5T.c b/src/H5T.c index a3d8710..201141c 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -5,9 +5,6 @@ * Programmer: Robb Matzke * Tuesday, March 31, 1998 */ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif #define H5T_PACKAGE /*suppress error about including H5Tpkg */ diff --git a/src/H5TB.c b/src/H5TB.c index 67591a0..fb0eede 100644 --- a/src/H5TB.c +++ b/src/H5TB.c @@ -56,10 +56,6 @@ * void H5TB_free( ITM ***root, void (*df)(ITM *), void (*kf)(void *) ); */ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ #include /*library */ diff --git a/src/H5TS.c b/src/H5TS.c index dcf018f..7b6af3b 100644 --- a/src/H5TS.c +++ b/src/H5TS.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ /* private headers */ diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index f454b0a..133253e 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ diff --git a/src/H5public.h b/src/H5public.h index 4793006..fe2d54f 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ diff --git a/test/tarray.c b/test/tarray.c index ebb5ff8..34047c5 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/tattr.c b/test/tattr.c index 4747c74..7bef8df 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/testhdf5.c b/test/testhdf5.c index e206046..83d42c4 100644 --- a/test/testhdf5.c +++ b/test/testhdf5.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ /* diff --git a/test/tfile.c b/test/tfile.c index b158fb5..c9be023 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/tgenprop.c b/test/tgenprop.c index a70ac06..8789fc5 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/th5s.c b/test/th5s.c index 8d25978..a6052e2 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/titerate.c b/test/titerate.c index 5e56001..b067b88 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/tmeta.c b/test/tmeta.c index ade015a..8b4c161 100644 --- a/test/tmeta.c +++ b/test/tmeta.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/trefer.c b/test/trefer.c index 9935b5b..a010302 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/tselect.c b/test/tselect.c index b108b5c..1f9c329 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/ttbbt.c b/test/ttbbt.c index b839b6f..364f117 100644 --- a/test/ttbbt.c +++ b/test/ttbbt.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ /* diff --git a/test/ttime.c b/test/ttime.c index 2ff5426..8ce2cc9 100644 --- a/test/ttime.c +++ b/test/ttime.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/ttsafe.c b/test/ttsafe.c index 6920321..663872b 100644 --- a/test/ttsafe.c +++ b/test/ttsafe.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "@(#)$Revision$"; -#endif - /* $Id$ */ /* diff --git a/test/tvlstr.c b/test/tvlstr.c index ee3867c..bab4365 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** diff --git a/test/tvltypes.c b/test/tvltypes.c index ea4d481..1738bf4 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -10,10 +10,6 @@ * * ****************************************************************************/ -#ifdef RCSID -static char RcsId[] = "$Revision$"; -#endif - /* $Id$ */ /*********************************************************** -- cgit v0.12