WITH_HASH_MAP

Panu Matilainen pmatilai at laiskiainen.org
Thu Jun 29 08:33:08 PDT 2006


On Wed, 2006-06-28 at 16:55 +0200, Ralf Corsepius wrote:
> On Wed, 2006-06-28 at 16:18 +0200, Ralf Corsepius wrote:
> > On Wed, 2006-06-28 at 06:25 -0700, Panu Matilainen wrote:
> > > On Wed, 28 Jun 2006, Ralf Corsepius wrote:
> 
> > > All that's needed is s/WITH_HASH_MAP/WITH_GNU_HASH_MAP/ in the rpm 
> > > directory to resurrect the thing that's supposed to have been enabled all 
> > > these years (been unused since March 2003).
> 
> The patch below implements what you outline above.

Why use two separate ifdef's for this when one would do just fine?

@@ -15,10 +15,14 @@
 #include <rpm/rpmlib.h>

 RPMPackageData::RPMPackageData()
-   : MinArchScore(-1)
-#ifdef WITH_HASH_MAP
-   , ArchScores(31), VerMap(517)
+   :
+#ifdef WITH_GNU_HASH_MAP
+  VerMap(517),
 #endif
+  MinArchScore(-1)
+#ifdef WITH_GNU_HASH_MAP
+   , ArchScores(31)
+#endif
 {
    BaseArch = _config->Find("APT::Architecture");
    if (BaseArch == "x86_64" || BaseArch == "ia64" ||

	- Panu -




More information about the Apt-Rpm mailing list