diff options
| author | David Robillard <d@drobilla.net> | 2008-01-11 03:05:51 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-11 03:05:51 +0000 |
| commit | 0b78db0b9ec2747c97792765f2e6131eb6f4e125 (patch) | |
| tree | b20603aaaeada9c0abb171ac5fbef34858d87204 | |
| parent | 822b2d86e56267773153a487fbf02dd8697d222f (diff) | |
Fix GCC 4.2 warnings.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2893 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/audio_library.cc | 8 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc index 2ed4739a96..1a05ceb4fd 100644 --- a/libs/ardour/audio_library.cc +++ b/libs/ardour/audio_library.cc @@ -33,7 +33,7 @@ using namespace std; using namespace ARDOUR; -static char* TAG = "http://ardour.org/ontology/Tag"; +static const char* TAG = "http://ardour.org/ontology/Tag"; AudioLibrary::AudioLibrary () { @@ -106,7 +106,7 @@ AudioLibrary::get_tags (string member) lrdf_statement pattern; pattern.subject = strdup(path2uri(member).c_str()); - pattern.predicate = TAG; + pattern.predicate = (char*)TAG; pattern.object = 0; pattern.object_type = lrdf_literal; @@ -138,8 +138,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 = "?"; - pattern->predicate = TAG; + pattern->subject = (char*)"?"; + pattern->predicate = (char*)TAG; pattern->object = strdup((*i).c_str()); pattern->next = old; diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 10d67421fb..dcaf98e0a9 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -467,7 +467,7 @@ find_file (string name, string dir, string subdir = "") string ARDOUR::find_config_file (string name) { - char* envvar; + const char* envvar; if ((envvar = getenv("ARDOUR_CONFIG_PATH")) == 0) { envvar = CONFIG_DIR; @@ -479,7 +479,7 @@ ARDOUR::find_config_file (string name) string ARDOUR::find_data_file (string name, string subdir) { - char* envvar; + const char* envvar; if ((envvar = getenv("ARDOUR_DATA_PATH")) == 0) { envvar = DATA_DIR; } |