Changeset 5593
- Timestamp:
- 06/09/08 16:03:44 (2 months ago)
- Files:
-
- libwired/trunk/libwired/p7/wi-p7-message.c (modified) (4 diffs)
- libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
libwired/trunk/libwired/p7/wi-p7-message.c
r5570 r5593 471 471 case WI_P7_ENUM: 472 472 if(wi_p7_message_get_enum_for_name(p7_message, &p7_enum, field_name)) 473 field_value = wi_dictionary_data_for_key(wi_p7_spec_field_enums_by_value(field), (void *) p7_enum);473 field_value = wi_dictionary_data_for_key(wi_p7_spec_field_enums_by_value(field), (void *) (intptr_t) p7_enum); 474 474 break; 475 475 … … 1589 1589 } 1590 1590 1591 enum_value = (wi_p7_enum_t) wi_dictionary_data_for_key(enums, enum_name);1591 enum_value = (wi_p7_enum_t) (intptr_t) wi_dictionary_data_for_key(enums, enum_name); 1592 1592 1593 1593 return wi_p7_message_set_enum_for_name(p7_message, enum_value, field_name); … … 1607 1607 enums = wi_p7_spec_field_enums_by_value(field); 1608 1608 1609 if(!wi_dictionary_contains_key(enums, ( void *) enum_value)) {1609 if(!wi_dictionary_contains_key(enums, (intptr_t) (void *) enum_value)) { 1610 1610 wi_error_set_libwired_error_with_format(WI_ERROR_P7_UNKNOWNFIELD, 1611 1611 WI_STR("No name found for enum \"%u\""), enum_value); … … 1617 1617 } 1618 1618 1619 return wi_dictionary_data_for_key(enums, (void *) enum_value);1619 return wi_dictionary_data_for_key(enums, (void *) (intptr_t) enum_value); 1620 1620 } 1621 1621 libwired/trunk/libwired/p7/wi-p7-spec.c
r5551 r5593 1545 1545 1546 1546 if(p7_message->serialization == WI_P7_BINARY) { 1547 message = wi_dictionary_data_for_key(p7_spec->messages_id, (void *) p7_message->binary_id);1547 message = wi_dictionary_data_for_key(p7_spec->messages_id, (void *) (intptr_t) p7_message->binary_id); 1548 1548 1549 1549 if(!message) { … … 1570 1570 } 1571 1571 1572 parameter = wi_dictionary_data_for_key(message->parameters_id, (void *) field_id);1572 parameter = wi_dictionary_data_for_key(message->parameters_id, (void *) (intptr_t) field_id); 1573 1573 1574 1574 if(parameter && parameter->required)
