[vlc-commits] vlc_arrays: rename reserved identifier

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Thu May 18 12:59:19 2017 +0200| [c882a670e448017beafe959145e20b300206e50f] | committer: Rémi Denis-Courmont

vlc_arrays: rename reserved identifier

double underscore is reserved to the implementation according to both
the C and C++ ISO standards; as such we should not use such naming.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c882a670e448017beafe959145e20b300206e50f
---

 include/vlc_arrays.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h
index b9fa33df93..5708dbe1e8 100644
--- a/include/vlc_arrays.h
+++ b/include/vlc_arrays.h
@@ -501,8 +501,8 @@ vlc_dictionary_all_keys( const vlc_dictionary_t * p_dict )
 }
 
 static inline void
-__vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key,
-                         void * p_value, bool rebuild )
+vlc_dictionary_insert_impl_( vlc_dictionary_t * p_dict, const char * psz_key,
+                             void * p_value, bool rebuild )
 {
     if( !p_dict->p_entries )
         vlc_dictionary_init( p_dict, 1 );
@@ -533,7 +533,7 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key,
                 p_entry = p_dict->p_entries[i];
                 while( p_entry )
                 {
-                    __vlc_dictionary_insert( &new_dict, p_entry->psz_key,
+                    vlc_dictionary_insert_impl_( &new_dict, p_entry->psz_key,
                                              p_entry->p_value,
                                              false /* To avoid multiple rebuild loop */);
                     p_entry = p_entry->p_next;
@@ -550,7 +550,7 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key,
 static inline void
 vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key, void * p_value )
 {
-    __vlc_dictionary_insert( p_dict, psz_key, p_value, true );
+    vlc_dictionary_insert_impl_( p_dict, psz_key, p_value, true );
 }
 
 static inline void