- apply proper const casting since C++ has become more stringent

diff --git a/include/configuration.h b/include/configuration.h
index 289c0c196b6766f90774f5b98475426b2a5917fc..182a5c13ed8ae2b882d506e1b1e2bb7d67b179ed 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -373,7 +373,7 @@ int config_AutoSaveConfigFile( vlc_object_t * );
 
 #define change_integer_list( list, list_text, list_update_func ) \
     p_config[i_config].i_list = sizeof(list)/sizeof(int); \
-    p_config[i_config].pi_list = list; \
+    p_config[i_config].pi_list = (int *)list; \
     p_config[i_config].ppsz_list_text = list_text;
 
 #define change_integer_range( min, max ) \
@@ -391,7 +391,7 @@ int config_AutoSaveConfigFile( vlc_object_t * );
     p_config[i_config].ppf_action = (vlc_callback_t *) \
       realloc( p_config[i_config].ppf_action, \
       (p_config[i_config].i_action + 1) * sizeof(void *) ); \
-    p_config[i_config].ppsz_action_text = (char **)\
+    p_config[i_config].ppsz_action_text = (const char **)\
       realloc( p_config[i_config].ppsz_action_text, \
       (p_config[i_config].i_action + 1) * sizeof(void *) ); \
     p_config[i_config].ppf_action[p_config[i_config].i_action] = pf_action; \

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index bbb78f260d338e65396cdbebb8a43fc5f4f15117..65588388ea5a70760ded45babdb5f18a79e10b16 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -77,12 +77,12 @@ static const char *ppsz_adev_text[] = { N_("Default"), N_("None") };
 static int  pi_tuner_input[] = { 0, 1, 2 };
 static const char *ppsz_tuner_input_text[] =
     {N_("Default"), N_("Cable"), N_("Antenna")};
-static int pi_amtuner_mode[] = { AMTUNER_MODE_DEFAULT,
+static const int pi_amtuner_mode[]  = { AMTUNER_MODE_DEFAULT,
                                  AMTUNER_MODE_TV,
                                  AMTUNER_MODE_FM_RADIO,
                                  AMTUNER_MODE_AM_RADIO,
                                  AMTUNER_MODE_DSS };
-static char *ppsz_amtuner_mode_text[] = { N_("Default"),
+static const char *ppsz_amtuner_mode_text[] = { N_("Default"),
                                           N_("TV"),
                                           N_("FM radio"),
                                           N_("AM radio"),
@@ -1817,8 +1817,8 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
         /* Keep the 2 first entries */
         for( i = 2; i < p_item->i_list; i++ )
         {
-            free( p_item->ppsz_list[i] );
-            free( p_item->ppsz_list_text[i] );
+            free( const_cast<char *>(p_item->ppsz_list[i]) );
+            free( const_cast<char *>(p_item->ppsz_list_text[i]) );
         }
         /* TODO: Remove when no more needed */
         p_item->ppsz_list[i] = NULL;
@@ -1840,10 +1840,10 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
     if( !list_devices.size() ) return VLC_SUCCESS;
 
     p_item->ppsz_list =
-        (char **)realloc( p_item->ppsz_list,
+        (const char **)realloc( p_item->ppsz_list,
                           (list_devices.size()+3) * sizeof(char *) );
     p_item->ppsz_list_text =
-        (char **)realloc( p_item->ppsz_list_text,
+        (const char **)realloc( p_item->ppsz_list_text,
                           (list_devices.size()+3) * sizeof(char *) );
 
     list<string>::iterator iter;