diff options
| author | Matthew Jordan <mjordan@digium.com> | 2015-03-30 02:39:57 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2015-03-30 02:39:57 +0000 |
| commit | ce59fabd5c01a48b8f4fcd1d7522aef9f3fbe66d (patch) | |
| tree | 35b10288ab5fef312e96a9e455184072e2484ac7 /include | |
| parent | 61577cbee684c764b75322c2e4b7ff6741c9482c (diff) | |
clang compiler warnings: Fix invalid enum conversion
This patch fixes some invalid enum conversion warnings caught by clang. In
particular:
* chan_sip: Several functions mixed usage of the st_refresher_param
enum and st_refresher enum. This patch corrects the functions to use the
right enum.
* chan_pjsip: Fixed mixed usage of ast_sip_session_t38state and ast_t38_state.
* strings: Fixed incorrect usage of AO2 flags with strings container.
* res_stasis: Change a return enumeration to stasis_app_user_event_res.
Review: https://reviewboard.asterisk.org/r/4535
ASTERISK-24917
Reported by: dkdegroot
patches:
rb4535.patch submitted by dkdegroot (License 6600)
........
Merged revisions 433746 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 433747 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/strings.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h index 79a2e49c8..7af92affc 100644 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -1233,7 +1233,8 @@ static force_inline char *attribute_pure ast_str_to_upper(char *str) * \retval AO2 container for strings * \retval NULL if allocation failed */ -struct ao2_container *ast_str_container_alloc_options(enum ao2_container_opts opts, int buckets); +//struct ao2_container *ast_str_container_alloc_options(enum ao2_container_opts opts, int buckets); +struct ao2_container *ast_str_container_alloc_options(enum ao2_alloc_opts opts, int buckets); /*! * \since 12 |