Change ushort to unsigned short in cpp

shehzan10 · shehzan10 · commit 984525caeac0 · 2015-09-22T19:16:50.000-04:00
diff --git 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
@@ -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);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ namespace af`
`92`	`92`	`case c32: return sizeof(float) * 2;`
`93`	`93`	`case c64: return sizeof(double) * 2;`
`94`	`94`	`case s16: return sizeof(short);`
`95`		`- case u16: return sizeof(ushort);`
	`95`	`+ case u16: return sizeof(unsigned short);`
`96`	`96`	`default: return sizeof(float);`
`97`	`97`	`}`
`98`	`98`	`}`