diff options
Diffstat (limited to 'src/libcharon/encoding/payloads/proposal_substructure.h')
| -rw-r--r-- | src/libcharon/encoding/payloads/proposal_substructure.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libcharon/encoding/payloads/proposal_substructure.h b/src/libcharon/encoding/payloads/proposal_substructure.h index 56e7184b6..a7ad97e1c 100644 --- a/src/libcharon/encoding/payloads/proposal_substructure.h +++ b/src/libcharon/encoding/payloads/proposal_substructure.h @@ -111,11 +111,19 @@ struct proposal_substructure_t { proposal_t * (*get_proposal) (proposal_substructure_t *this); /** +<<<<<<< HEAD * Clones an proposal_substructure_t object. * * @return cloned object */ proposal_substructure_t* (*clone) (proposal_substructure_t *this); +======= + * Create an enumerator over transform substructures. + * + * @return enumerator over transform_substructure_t + */ + enumerator_t* (*create_substructure_enumerator)(proposal_substructure_t *this); +>>>>>>> upstream/4.5.1 /** * Destroys an proposal_substructure_t object. |