[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6bef6864a320467f5c7c65cc74ff0fd6b1aa32d2
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

6bef686 by Jaap Keuter (jaap.keuter@xxxxxxxxx):

    P1: fix request for implicit conversion from 'gpointer' to 'struct p1_address_ctx_t *' not permitted in C++ [-Wc++-compat]
    
    Backport change I43364dda21abe3281fbd15ad953232093bb1fffa to
    master-1.12 also.
    
    Change-Id: Id970d4f92e853ab3f41fe4336bd3c0de28852b02
    Reviewed-on: https://code.wireshark.org/review/15396
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  41986d0   pcap-common: Fix several serious ENCAP_ERF extension header writing issues
    adds  6bef686   P1: fix request for implicit conversion from 'gpointer' to 'struct p1_address_ctx_t *' not permitted in C++ [-Wc++-compat]


Summary of changes:
 asn1/p1/packet-p1-template.c |    2 +-
 epan/dissectors/packet-p1.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)