diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2010-12-11 15:09:47 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2010-12-11 15:09:47 +0000 |
| commit | 80c61db0cda63e565197abcbbc11b504c9a76c17 (patch) | |
| tree | 7c332032dcefa82fb92a080e1eee7807a548030f /libs | |
| parent | 680a3f2b865348a3a4d9c54cccc5155016ff4a98 (diff) | |
Fix compiler warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@8246 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ladspa_plugin.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/uri_map.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc index 8214475065..43fa8e43ee 100644 --- a/libs/ardour/ladspa_plugin.cc +++ b/libs/ardour/ladspa_plugin.cc @@ -867,7 +867,7 @@ LadspaPlugin::do_save_preset (string name) std::string unique (unique_id()); if (!isdigit (unique[0])) { - return false; + return ""; } uint32_t const id = atol (unique.c_str()); @@ -885,7 +885,7 @@ LadspaPlugin::do_save_preset (string name) string const envvar = preset_envvar (); if (envvar.empty()) { warning << _("Could not locate HOME. Preset not saved.") << endmsg; - return false; + return ""; } string const source = preset_source (envvar); diff --git a/libs/ardour/uri_map.cc b/libs/ardour/uri_map.cc index 116236a8b6..9b5843a40e 100644 --- a/libs/ardour/uri_map.cc +++ b/libs/ardour/uri_map.cc @@ -61,7 +61,7 @@ URIMap::uri_to_id(const char* map, } else { if (_global_to_event.size() + 1 > UINT16_MAX) { PBD::error << "Event URI " << uri << " ID out of range." << endl; - return NULL; + return 0; } const uint16_t ev_id = _global_to_event.size() + 1; assert(_event_to_global.find(ev_id) == _event_to_global.end()); |