[arrayfire] 74/248: Change ushort to unsigned short in cpp

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit 984525caeac0be44dd5260788fc83af99f1b38d6
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Tue Sep 22 19:16:50 2015 -0400

    Change ushort to unsigned short in cpp
---
 src/api/cpp/array.cpp  | 12 ++++++------
 src/api/cpp/device.cpp |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/api/cpp/array.cpp b/src/api/cpp/array.cpp
index 8d7f164..208f60e 100644
--- a/src/api/cpp/array.cpp
+++ b/src/api/cpp/array.cpp
@@ -85,7 +85,7 @@ namespace af
         case c32: return sizeof(float) * 2;
         case c64: return sizeof(double) * 2;
         case s16: return sizeof(short);
-        case u16: return sizeof(ushort);
+        case u16: return sizeof(unsigned short);
         default: return sizeof(float);
         }
     }
@@ -222,7 +222,7 @@ namespace af
     INSTANTIATE(intl)
     INSTANTIATE(uintl)
     INSTANTIATE(short)
-    INSTANTIATE(ushort)
+    INSTANTIATE(unsigned short)
 
 #undef INSTANTIATE
 
@@ -1029,8 +1029,8 @@ af::dtype implicit_dtype(af::dtype scalar_type, af::dtype array_type)
     INSTANTIATE(char)
     INSTANTIATE(intl)
     INSTANTIATE(uintl)
-    INSTANTIATE(short);
-    INSTANTIATE(ushort);
+    INSTANTIATE(short)
+    INSTANTIATE(unsigned short)
 
 #undef INSTANTIATE
 
@@ -1059,8 +1059,8 @@ af::dtype implicit_dtype(af::dtype scalar_type, af::dtype array_type)
     INSTANTIATE(char)
     INSTANTIATE(intl)
     INSTANTIATE(uintl)
-    INSTANTIATE(short);
-    INSTANTIATE(ushort);
+    INSTANTIATE(short)
+    INSTANTIATE(unsigned short)
 
 #undef INSTANTIATE
 #undef TEMPLATE_MEM_FUNC
diff --git a/src/api/cpp/device.cpp b/src/api/cpp/device.cpp
index 193cba3..f24a82a 100644
--- a/src/api/cpp/device.cpp
+++ b/src/api/cpp/device.cpp
@@ -92,7 +92,7 @@ namespace af
         case c32: return sizeof(float) * 2;
         case c64: return sizeof(double) * 2;
         case s16: return sizeof(short);
-        case u16: return sizeof(ushort);
+        case u16: return sizeof(unsigned short);
         default: return sizeof(float);
         }
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git