From 5b9433f42f3646086d31b69f30ddcd8d8bd9f22f Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 25 Feb 2009 19:35:32 +0000
Subject: Fix stupid warnings.

git-svn-id: svn://localhost/ardour2/branches/3.0@4659 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/taglib/taglib/mpeg/id3v2/id3v2footer.cpp | 2 +-
 libs/taglib/taglib/mpeg/id3v2/id3v2footer.h   | 2 +-
 libs/taglib/taglib/toolkit/tbytevector.cpp    | 4 ++--
 libs/taglib/taglib/toolkit/tstring.cpp        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'libs')

diff --git a/libs/taglib/taglib/mpeg/id3v2/id3v2footer.cpp b/libs/taglib/taglib/mpeg/id3v2/id3v2footer.cpp
index 387bcf3229..8ac79a8185 100644
--- a/libs/taglib/taglib/mpeg/id3v2/id3v2footer.cpp
+++ b/libs/taglib/taglib/mpeg/id3v2/id3v2footer.cpp
@@ -45,7 +45,7 @@ Footer::~Footer()
 
 }
 
-const unsigned int Footer::size()
+unsigned int Footer::size()
 {
   return FooterPrivate::size;
 }
diff --git a/libs/taglib/taglib/mpeg/id3v2/id3v2footer.h b/libs/taglib/taglib/mpeg/id3v2/id3v2footer.h
index 112e75810a..86d3ff9763 100644
--- a/libs/taglib/taglib/mpeg/id3v2/id3v2footer.h
+++ b/libs/taglib/taglib/mpeg/id3v2/id3v2footer.h
@@ -62,7 +62,7 @@ namespace TagLib {
       /*!
        * Returns the size of the footer.  Presently this is always 10 bytes.
        */
-      static const unsigned int size();
+      static unsigned int size();
 
       /*!
        * Renders the footer based on the data in \a header.
diff --git a/libs/taglib/taglib/toolkit/tbytevector.cpp b/libs/taglib/taglib/toolkit/tbytevector.cpp
index 59da5192eb..766797764a 100644
--- a/libs/taglib/taglib/toolkit/tbytevector.cpp
+++ b/libs/taglib/taglib/toolkit/tbytevector.cpp
@@ -147,12 +147,12 @@ namespace TagLib {
   public:
     ByteVectorMirror(const ByteVector &source) : v(source) {}
 
-    const char operator[](int index) const
+    char operator[](int index) const
     {
       return v[v.size() - index - 1];
     }
 
-    const char at(int index) const
+    char at(int index) const
     {
       return v.at(v.size() - index - 1);
     }
diff --git a/libs/taglib/taglib/toolkit/tstring.cpp b/libs/taglib/taglib/toolkit/tstring.cpp
index cd274367e6..ffb706f70a 100644
--- a/libs/taglib/taglib/toolkit/tstring.cpp
+++ b/libs/taglib/taglib/toolkit/tstring.cpp
@@ -35,7 +35,7 @@ namespace TagLib {
 
   inline unsigned short byteSwap(unsigned short x)
   {
-    return ((x) >> 8) & 0xff | ((x) & 0xff) << 8;
+    return (((x) >> 8) & 0xff) | (((x) & 0xff) << 8);
   }
 
   inline unsigned short combine(unsigned char c1, unsigned char c2)
-- 
cgit v1.2.3