Make our perfect hash functions be valid C++.

tglsfdc · tglsfdc · commit 9e58705a7f97 · 2019-05-31T10:40:00.000-04:00
While C is happy to cast "const void *" to "const unsigned char *" silently, C++ insists on an explicit cast. Since we put these functions into header files, cpluspluscheck whines about that. Add the cast to pacify it. Discussion: https://postgr.es/m/b517ec3918d645eb950505eac8dd434e@gaz-is.ru
diff --git a/src/tools/PerfectHash.pm b/src/tools/PerfectHash.pm
@@ -131,7 +131,7 @@ sub generate_hash_function
 	}
 	$f .= sprintf "\n" if ($nhash % 8 != 0);
 	$f .= sprintf "\t};\n\n";
-	$f .= sprintf "\tconst unsigned char *k = key;\n";
+	$f .= sprintf "\tconst unsigned char *k = (const unsigned char *) key;\n";
 	$f .= sprintf "\tsize_t\t\tkeylen = %d;\n", $options{fixed_key_length}
 	  if (defined $options{fixed_key_length});
 	$f .= sprintf "\tuint32\t\ta = %d;\n",   $hash_seed1;

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ sub generate_hash_function`
`131`	`131`	`}`
`132`	`132`	`$f .= sprintf "\n" if ($nhash % 8 != 0);`
`133`	`133`	`$f .= sprintf "\t};\n\n";`
`134`		`- $f .= sprintf "\tconst unsigned char *k = key;\n";`
	`134`	`+ $f .= sprintf "\tconst unsigned char k = (const unsigned char ) key;\n";`
`135`	`135`	`$f .= sprintf "\tsize_t\t\tkeylen = %d;\n", $options{fixed_key_length}`
`136`	`136`	`if (defined $options{fixed_key_length});`
`137`	`137`	`$f .= sprintf "\tuint32\t\ta = %d;\n", $hash_seed1;`