From b1c67fc5dceeb3f297ac14f5820e5a26c7388ef0 Mon Sep 17 00:00:00 2001
From: Festus Hagen <festushagen2002@yahoo.com>
Date: Sun, 29 Nov 2015 05:13:44 -0500
Subject: [PATCH] Silence ushort ambiguity errors

---
 taglib/toolkit/tstring.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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);