smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix const cast warnings generated by new flags

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13124 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-08-10 15:57:09 +00:00
parent 69ca705286
commit 760ccbabfb
16 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View file

@ -1957,7 +1957,7 @@ JACK, reconnect and save the session."), PROGRAM_NAME);
msg.run (); msg.run ();
if (free_reason) { if (free_reason) {
free ((char*) reason); free (const_cast<char*> (reason));
} }
} }

4
gtk2_ardour/editor.cc
View file

@ -3112,8 +3112,8 @@ Editor::convert_drop_to_paths (
const char* q; const char* q;
p = (const char *) malloc (txt.length() + 1); p = (const char *) malloc (txt.length() + 1);
txt.copy ((char *) p, txt.length(), 0); txt.copy (const_cast<char *> (p), txt.length(), 0);
((char*)p)[txt.length()] = '\0'; const_cast<char*>(p)[txt.length()] = '\0';
while (p) while (p)
{ {

4
gtk2_ardour/lv2_plugin_ui.cc
View file

@ -203,7 +203,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
_external_ui_feature.URI = LV2_EXTERNAL_UI_URI; _external_ui_feature.URI = LV2_EXTERNAL_UI_URI;
_external_ui_feature.data = &_external_ui_host; _external_ui_feature.data = &_external_ui_host;
features_src = features = (LV2_Feature**)_lv2->features(); features_src = features = const_cast<LV2_Feature**>(_lv2->features());
features_count = 2; features_count = 2;
while (*features++) { while (*features++) {
features_count++; features_count++;
@ -216,7 +216,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
*features++ = *features_src++; *features++ = *features_src++;
} }
} else { } else {
features_dst = (LV2_Feature**)_lv2->features(); features_dst = const_cast<LV2_Feature**>(_lv2->features());
} }
if (!ui_host) { if (!ui_host) {

4
gtk2_ardour/utils.cc
View file

@ -226,13 +226,13 @@ get_font_for_style (string widgetname)
Glib::RefPtr<const Pango::Layout> layout = foobar.get_layout(); Glib::RefPtr<const Pango::Layout> layout = foobar.get_layout();
PangoFontDescription *pfd = (PangoFontDescription *)pango_layout_get_font_description((PangoLayout *)layout->gobj()); PangoFontDescription *pfd = (PangoFontDescription *)pango_layout_get_font_description(const_cast<PangoLayout *>(layout->gobj()));
if (!pfd) { if (!pfd) {
/* layout inherited its font description from a PangoContext */ /* layout inherited its font description from a PangoContext */
PangoContext* ctxt = (PangoContext*) pango_layout_get_context ((PangoLayout*) layout->gobj()); PangoContext* ctxt = (PangoContext*) pango_layout_get_context (const_cast<PangoLayout*>(layout->gobj()));
pfd = pango_context_get_font_description (ctxt); pfd = pango_context_get_font_description (ctxt);
return Pango::FontDescription (pfd); /* make a copy */ return Pango::FontDescription (pfd); /* make a copy */
} }

6
libs/ardour/audio_library.cc
View file

@ -94,7 +94,7 @@ AudioLibrary::get_tags (string member)
lrdf_statement pattern; lrdf_statement pattern;
pattern.subject = strdup(Glib::filename_to_uri(member).c_str()); pattern.subject = strdup(Glib::filename_to_uri(member).c_str());
pattern.predicate = (char*)TAG; pattern.predicate = const_cast<char*>(TAG);
pattern.object = 0; pattern.object = 0;
pattern.object_type = lrdf_literal; pattern.object_type = lrdf_literal;
@ -126,8 +126,8 @@ AudioLibrary::search_members_and (vector<string>& members, const vector<string>&
vector<string>::const_iterator i; vector<string>::const_iterator i;
for (i = tags.begin(); i != tags.end(); ++i){ for (i = tags.begin(); i != tags.end(); ++i){
pattern = new lrdf_statement; pattern = new lrdf_statement;
pattern->subject = (char*)"?"; pattern->subject = const_cast<char*>("?");
pattern->predicate = (char*)TAG; pattern->predicate = const_cast<char*>(TAG);
pattern->object = strdup((*i).c_str()); pattern->object = strdup((*i).c_str());
pattern->next = old; pattern->next = old;

3
libs/ardour/midi_source.cc
View file

@ -232,7 +232,8 @@ MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_sta
_name, time_frames + source_start, i->event_type(), i->size())); _name, time_frames + source_start, i->event_type(), i->size()));
if (tracker) { if (tracker) {
Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(Evoral::MIDIEvent<Evoral::MusicalTime>*) (&(*i))); Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(reinterpret_cast<Evoral::MIDIEvent<Evoral::MusicalTime>*>
(const_cast<Evoral::Event<Evoral::MusicalTime>*> (&(*i)))));
if (ev.is_note_on()) { if (ev.is_note_on()) {
DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 track note on %2 @ %3 velocity %4\n", _name, (int) ev.note(), time_frames, (int) ev.velocity())); DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 track note on %2 @ %3 velocity %4\n", _name, (int) ev.note(), time_frames, (int) ev.velocity()));
tracker->add (ev.note(), ev.channel()); tracker->add (ev.note(), ev.channel());

4
libs/ardour/plugin_manager.cc
View file

@ -452,7 +452,7 @@ PluginManager::get_ladspa_category (uint32_t plugin_id)
snprintf(buf, sizeof(buf), "%s%" PRIu32, LADSPA_BASE, plugin_id); snprintf(buf, sizeof(buf), "%s%" PRIu32, LADSPA_BASE, plugin_id);
pattern.subject = buf; pattern.subject = buf;
pattern.predicate = (char*)RDF_TYPE; pattern.predicate = const_cast<char*>(RDF_TYPE);
pattern.object = 0; pattern.object = 0;
pattern.object_type = lrdf_uri; pattern.object_type = lrdf_uri;
@ -463,7 +463,7 @@ PluginManager::get_ladspa_category (uint32_t plugin_id)
} }
pattern.subject = matches1->object; pattern.subject = matches1->object;
pattern.predicate = (char*)(LADSPA_BASE "hasLabel"); pattern.predicate = const_cast<char*>(LADSPA_BASE "hasLabel");
pattern.object = 0; pattern.object = 0;
pattern.object_type = lrdf_literal; pattern.object_type = lrdf_literal;

2
libs/ardour/route.cc
View file

@ -2313,7 +2313,7 @@ Route::set_state_2X (const XMLNode& node, int version)
} else if (keyname == "editor") { } else if (keyname == "editor") {
sk = EditorSort; sk = EditorSort;
} else { } else {
RouteSortOrderKey sk = (RouteSortOrderKey) string_2_enum (remaining.substr (0, equal), sk); sk = (RouteSortOrderKey) string_2_enum (remaining.substr (0, equal), sk);
} }
set_order_key (sk, n); set_order_key (sk, n);

2
libs/ardour/smf_source.cc
View file

@ -361,7 +361,7 @@ SMFSource::append_event_unlocked_frames (const Evoral::Event<framepos_t>& ev, fr
const Evoral::Event<double> beat_ev (ev.event_type(), const Evoral::Event<double> beat_ev (ev.event_type(),
ev_time_beats, ev_time_beats,
ev.size(), ev.size(),
(uint8_t*)ev.buffer()); const_cast<uint8_t*>(ev.buffer()));
_model->append (beat_ev, event_id); _model->append (beat_ev, event_id);
} }

2
libs/ardour/sndfilesource.cc
View file

@ -858,7 +858,7 @@ SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, stri
sf_info.format = 0; // libsndfile says to clear this before sf_open(). sf_info.format = 0; // libsndfile says to clear this before sf_open().
if ((sf = sf_open ((char*) path.c_str(), SFM_READ, &sf_info)) == 0) { if ((sf = sf_open (const_cast<char*>(path.c_str()), SFM_READ, &sf_info)) == 0) {
char errbuf[256]; char errbuf[256];
error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1); error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1);
return false; return false;

2
libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
View file

@ -83,7 +83,7 @@ struct UIRequest : public BaseUI::BaseRequestObject {
~UIRequest () { ~UIRequest () {
if (type == ErrorMessage && msg) { if (type == ErrorMessage && msg) {
/* msg was strdup()'ed */ /* msg was strdup()'ed */
free ((char *)msg); free (const_cast<char *>(msg));
} }
} }
}; };

2
libs/pbd/locale_guard.cc
View file

@ -23,7 +23,7 @@ LocaleGuard::~LocaleGuard ()
setlocale (LC_NUMERIC, old); setlocale (LC_NUMERIC, old);
if (old) { if (old) {
free ((char*)old); free (const_cast<char*>(old));
} }
} }

4
libs/pbd/pbd/xml++.h
View file

@ -98,8 +98,8 @@ public:
const XMLPropertyList& properties() const { return _proplist; } const XMLPropertyList& properties() const { return _proplist; }
XMLProperty* property(const char*); XMLProperty* property(const char*);
XMLProperty* property(const std::string&); XMLProperty* property(const std::string&);
const XMLProperty* property(const char* n) const { return ((XMLNode*)this)->property(n); } const XMLProperty* property(const char* n) const { return const_cast<XMLNode*>(this)->property(n); }
const XMLProperty* property(const std::string& n) const { return ((XMLNode*)this)->property(n); } const XMLProperty* property(const std::string& n) const { return const_cast<XMLNode*>(this)->property(n); }
XMLProperty* add_property(const char* name, const std::string& value); XMLProperty* add_property(const char* name, const std::string& value);
XMLProperty* add_property(const char* name, const char* value = ""); XMLProperty* add_property(const char* name, const char* value = "");

2
libs/pbd/xml++.cc
View file

@ -131,7 +131,7 @@ XMLTree::read_buffer(const string& buffer)
delete _root; delete _root;
_root = 0; _root = 0;
doc = xmlParseMemory((char*)buffer.c_str(), buffer.length()); doc = xmlParseMemory(const_cast<char*>(buffer.c_str()), buffer.length());
if (!doc) { if (!doc) {
return false; return false;
} }

2
tools/sanity_check/systemtest.cpp
View file

@ -295,7 +295,7 @@ long long unsigned int system_available_physical_mem() {
char buf[256]; char buf[256];
long long unsigned int res = 0; long long unsigned int res = 0;
if (0<read_string((char*)"/proc/meminfo", buf, sizeof (buf))) { if (0<read_string(const_cast<char*>("/proc/meminfo"), buf, sizeof (buf))) {
if (strncmp (buf, "MemTotal:", 9) == 0) { if (strncmp (buf, "MemTotal:", 9) == 0) {
if (sscanf (buf, "%*s %llu", &res) != 1) { if (sscanf (buf, "%*s %llu", &res) != 1) {
perror ("parse error in /proc/meminfo"); perror ("parse error in /proc/meminfo");

16
wscript
View file

@ -334,8 +334,20 @@ def set_compiler_flags (conf,opt):
# warnings flags # warnings flags
# #
conf.env.append_value('CFLAGS', "-Wall") conf.env.append_value('CFLAGS', [ '-Wall',
conf.env.append_value('CXXFLAGS', [ '-Wall', '-Woverloaded-virtual']) '-Wpointer-arith',
'-Wcast-qual',
'-Wcast-align',
'-Wstrict-prototypes',
'-Wmissing-prototypes'
])
conf.env.append_value('CXXFLAGS', [ '-Wall',
'-Wpointer-arith',
'-Wcast-qual',
'-Wcast-align',
'-Woverloaded-virtual'
])
# #