diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-12 06:40:13 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-12 06:40:13 +0000 |
| commit | d0efafbcb19e7fb03662117d5ce393d1f4615a2e (patch) | |
| tree | 996764377e230fb513eda95b75d0f7e27b2d3237 /epan/uat.h | |
| parent | d249e6111a54777db0c360f8079f5c94e1335ea1 (diff) | |
| download | wireshark-d0efafbcb19e7fb03662117d5ce393d1f4615a2e.tar.gz | |
From beroset:
remove C++ incompatibilities from UAT_VS_DEF macro and all uses
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48259
Diffstat (limited to 'epan/uat.h')
| -rw-r--r-- | epan/uat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/uat.h b/epan/uat.h index 9e4e2b6bb7..bd30ad1641 100644 --- a/epan/uat.h +++ b/epan/uat.h @@ -487,14 +487,14 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, const char** out * rec_t: * value */ -#define UAT_VS_DEF(basename,field_name,rec_t,default_val,default_str) \ +#define UAT_VS_DEF(basename,field_name,rec_t,default_t,default_val,default_str) \ static void basename ## _ ## field_name ## _set_cb(void* rec, const char* buf, guint len, const void* vs, const void* u2 _U_) {\ guint i; \ char* str = ep_strndup(buf,len); \ const char* cstr; ((rec_t*)rec)->field_name = default_val; \ for(i=0; ( cstr = ((value_string*)vs)[i].strptr ) ;i++) { \ if (g_str_equal(cstr,str)) { \ - ((rec_t*)rec)->field_name = ((value_string*)vs)[i].value; return; } } } \ + ((rec_t*)rec)->field_name = (default_t)((value_string*)vs)[i].value; return; } } } \ static void basename ## _ ## field_name ## _tostr_cb(void* rec, const char** out_ptr, unsigned* out_len, const void* vs, const void* u2 _U_) {\ guint i; \ *out_ptr = ep_strdup(default_str); \ |