Merge lp:~jameinel/u1db/gcc_warning_int into lp:u1db

[John A Meinel]

Small tweak to use intptr_t instead of void * as the integer type used for storing the current generation.

If we ever get >2**31 generations we're going to have other problems, so we don't really need 64-bit safe values, but this keeps gcc from complaining.

[Eric Casteleijn (thisfred)]

review: Approve

=== modified file 'src/u1db_sync_target.c'
--- src/u1db_sync_target.c	2012-04-30 11:37:13 +0000
+++ src/u1db_sync_target.c	2012-05-15 09:12:19 +0000
@@ -272,7 +272,7 @@
     status = u1db_put_doc_if_newer(se->db, doc, 0, se->source_replica_uid,
                                    source_gen, &insert_state, &at_gen);
     if (insert_state == U1DB_INSERTED || insert_state == U1DB_CONVERGED) {
-	lh_table_insert(se->seen_ids, strdup(doc->doc_id), (void *)at_gen);
+	lh_table_insert(se->seen_ids, strdup(doc->doc_id), (void *)(intptr_t)at_gen);
     } else {
         // state should be either U1DB_SUPERSEDED or U1DB_CONFLICTED, in either
         // case, we don't count this as a 'seen_id' because we will want to be
@@ -301,7 +301,7 @@
     state = (struct _whats_changed_doc_ids_state *)context;
     if (state->exclude_ids != NULL
 	&& (e = lh_table_lookup_entry(state->exclude_ids, doc_id)) != NULL
-        && (int)e->v >= gen)
+        && (intptr_t)e->v >= gen)
     {
         // This document was already seen at this gen,
         // so we don't need to return it