From: Festus Hagen <festushagen2002@yahoo.com>
Date: Sun, 29 Nov 2015 10:13:44 +0000 (-0500)
Subject: Silence ushort ambiguity errors
X-Git-Tag: v1.11beta~73^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1c67fc5dceeb3f297ac14f5820e5a26c7388ef0;p=taglib

Silence ushort ambiguity errors
---

diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 829fe477..18b44d1a 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -174,7 +174,7 @@ namespace
     if(length > 0) {
       if(swap) {
         for(size_t i = 0; i < length; ++i)
-          data[i] = Utils::byteSwap(static_cast<ushort>(s[i]));
+          data[i] = Utils::byteSwap(static_cast<TagLib::ushort>(s[i]));
       }
       else {
         ::wmemcpy(&data[0], s, length);
@@ -194,7 +194,7 @@ namespace
       }
 
       // Uses memcpy instead of reinterpret_cast to avoid an alignment exception.
-      ushort bom;
+      TagLib::ushort bom;
       ::memcpy(&bom, s, 2);
 
       if(bom == 0xfeff)
@@ -215,7 +215,7 @@ namespace
 
     data.resize(length / 2);
     for(size_t i = 0; i < length / 2; ++i) {
-      ushort c;
+      TagLib::ushort c;
       ::memcpy(&c, s, 2);
       if(swap)
         c = Utils::byteSwap(c);