allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 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

6
libs/ardour/audio_library.cc
View File

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

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);
pattern.subject = buf;
pattern.predicate = (char*)RDF_TYPE;
pattern.predicate = const_cast<char*>(RDF_TYPE);
pattern.object = 0;
pattern.object_type = lrdf_uri;
@@ -463,7 +463,7 @@ PluginManager::get_ladspa_category (uint32_t plugin_id)
}
pattern.subject = matches1->object;
pattern.predicate = (char*)(LADSPA_BASE "hasLabel");
pattern.predicate = const_cast<char*>(LADSPA_BASE "hasLabel");
pattern.object = 0;
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") {
sk = EditorSort;
} 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);

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(),
ev_time_beats,
ev.size(),
(uint8_t*)ev.buffer());
const_cast<uint8_t*>(ev.buffer()));
_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().
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];
error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1);
return false;

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

@@ -83,7 +83,7 @@ struct UIRequest : public BaseUI::BaseRequestObject {
~UIRequest () {
if (type == ErrorMessage && msg) {
/* 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);
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; }
XMLProperty* property(const char*);
XMLProperty* property(const std::string&);
const XMLProperty* property(const char* n) const { return ((XMLNode*)this)->property(n); }
const XMLProperty* property(const std::string& 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 const_cast<XMLNode*>(this)->property(n); }
XMLProperty* add_property(const char* name, const std::string& 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;
_root = 0;
doc = xmlParseMemory((char*)buffer.c_str(), buffer.length());
doc = xmlParseMemory(const_cast<char*>(buffer.c_str()), buffer.length());
if (!doc) {
return false;
}