[svn:parrot] r48945 - in trunk: include/parrot src

[luben at svn.parrot.org]

Author: luben
Date: Sat Sep 11 23:45:06 2010
New Revision: 48945
URL: https://trac.parrot.org/parrot/changeset/48945

Log:
headerizer run

Modified:
   trunk/include/parrot/hash.h
   trunk/src/hash.c

Modified: trunk/include/parrot/hash.h
==============================================================================
--- trunk/include/parrot/hash.h	Sat Sep 11 23:44:56 2010	(r48944)
+++ trunk/include/parrot/hash.h	Sat Sep 11 23:45:06 2010	(r48945)
@@ -226,6 +226,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 PARROT_PURE_FUNCTION
+PARROT_INLINE
 int hash_compare_int(SHIM_INTERP,
     ARGIN_NULLOK(const void *a),
     ARGIN_NULLOK(const void *b));
@@ -360,6 +361,7 @@
 
 PARROT_WARN_UNUSED_RESULT
 PARROT_PURE_FUNCTION
+PARROT_INLINE
 size_t key_hash_int(SHIM_INTERP,
     ARGIN_NULLOK(const void *value),
     size_t seed);
@@ -473,9 +475,6 @@
        PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_parrot_new_pointer_hash __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_hash_compare_cstring __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(a) \
-    , PARROT_ASSERT_ARG(b))
 #define ASSERT_ARGS_hash_compare_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
 #define ASSERT_ARGS_hash_compare_pmc __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
@@ -534,8 +533,6 @@
 #define ASSERT_ARGS_hash_value_to_string __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(hash))
-#define ASSERT_ARGS_key_hash_cstring __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(value))
 #define ASSERT_ARGS_key_hash_int __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
 #define ASSERT_ARGS_key_hash_PMC __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \

Modified: trunk/src/hash.c
==============================================================================
--- trunk/src/hash.c	Sat Sep 11 23:44:56 2010	(r48944)
+++ trunk/src/hash.c	Sat Sep 11 23:45:06 2010	(r48945)
@@ -54,9 +54,6 @@
         __attribute__nonnull__(2);
 
 PARROT_WARN_UNUSED_RESULT
-<<<<<<< HEAD
-PARROT_CONST_FUNCTION
-=======
 PARROT_PURE_FUNCTION
 PARROT_INLINE
 static int hash_compare(PARROT_INTERP,
@@ -272,7 +269,8 @@
 
 /*
 
-=item C<size_t key_hash_cstring(PARROT_INTERP, const void *value, size_t seed)>
+=item C<static size_t key_hash_cstring(PARROT_INTERP, const void *value, size_t
+seed)>
 
 Creates and returns a hash value from a string.
 
@@ -305,7 +303,8 @@
 
 /*
 
-=item C<int hash_compare_cstring(PARROT_INTERP, const char *a, const char *b)>
+=item C<static int hash_compare_cstring(PARROT_INTERP, const char *a, const char
+*b)>
 
 Compares two C strings for equality, returning -1, 0, and 1 if the first string
 is less than, equal to, or greater than the second, respectively.