Fix GCC 4.2 warnings.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2893 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc
index 2ed4739a961fe357e58caf49821ebf657d8cccfd..1a05ceb4fdd783b859169743adf076b7c46758d8 100644 (file)
--- 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 10d67421fb018d65332903c65dc88923eb908854..dcaf98e0a9e86e8edcca202b2d0d5f63d684d2ae 100644 (file)
--- 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;
        }