nvapi: Replace usage of (u_)short with (u)int16_t

This guaranties always the same underlaying type (propably not that relevant for our use case here).
Also makes it more consistent with usage of (u)int32_t elsewhere.

3 files changed, 14 insertions, 14 deletions

diff --git a/src/sysinfo/nvapi_adapter_registry.cpp b/src/sysinfo/nvapi_adapter_registry.cpp
index d3e5543..aa21fc7 100644
--- a/src/sysinfo/nvapi_adapter_registry.cpp
+++ b/src/sysinfo/nvapi_adapter_registry.cpp
@@ -43,7 +43,7 @@ namespace dxvk {
         return !m_nvapiAdapters.empty();
     }
 
-    u_short NvapiAdapterRegistry::GetAdapterCount() const {
+    uint16_t NvapiAdapterRegistry::GetAdapterCount() const {
         return m_nvapiAdapters.size();
     }
 
@@ -51,7 +51,7 @@ namespace dxvk {
         return m_nvapiAdapters.front();
     }
 
-    NvapiAdapter* NvapiAdapterRegistry::GetAdapter(const u_short index) const {
+    NvapiAdapter* NvapiAdapterRegistry::GetAdapter(const uint16_t index) const {
         return index < m_nvapiAdapters.size() ? m_nvapiAdapters[index] : nullptr;
     }
 
@@ -71,7 +71,7 @@ namespace dxvk {
         return std::find(m_nvapiAdapters.begin(), m_nvapiAdapters.end(), handle) != m_nvapiAdapters.end();
     }
 
-    NvapiOutput* NvapiAdapterRegistry::GetOutput(const u_short index) const {
+    NvapiOutput* NvapiAdapterRegistry::GetOutput(const uint16_t index) const {
         return index < m_nvapiOutputs.size() ? m_nvapiOutputs[index] : nullptr;
     }
 
@@ -79,21 +79,21 @@ namespace dxvk {
         return std::find(m_nvapiOutputs.begin(), m_nvapiOutputs.end(), handle) != m_nvapiOutputs.end();
     }
 
-    short NvapiAdapterRegistry::GetPrimaryOutputId() const {
+    int16_t NvapiAdapterRegistry::GetPrimaryOutputId() const {
         auto it = std::find_if(m_nvapiOutputs.begin(), m_nvapiOutputs.end(),
             [](const auto& output) {
                 return output->IsPrimary();
             });
 
-        return static_cast<short>(it != m_nvapiOutputs.end() ? std::distance(m_nvapiOutputs.begin(), it) : -1);
+        return static_cast<int16_t>(it != m_nvapiOutputs.end() ? std::distance(m_nvapiOutputs.begin(), it) : -1);
     }
 
-    short NvapiAdapterRegistry::GetOutputId(const std::string& displayName) const {
+    int16_t NvapiAdapterRegistry::GetOutputId(const std::string& displayName) const {
         auto it = std::find_if(m_nvapiOutputs.begin(), m_nvapiOutputs.end(),
             [&displayName](const auto& output) {
                 return output->GetDeviceName() == displayName;
             });
 
-        return static_cast<short>(it != m_nvapiOutputs.end() ? std::distance(m_nvapiOutputs.begin(), it) : -1);
+        return static_cast<int16_t>(it != m_nvapiOutputs.end() ? std::distance(m_nvapiOutputs.begin(), it) : -1);
     }
 }
diff --git a/src/sysinfo/nvapi_adapter_registry.h b/src/sysinfo/nvapi_adapter_registry.h
index 4123e68..db2d79c 100644
--- a/src/sysinfo/nvapi_adapter_registry.h
+++ b/src/sysinfo/nvapi_adapter_registry.h
@@ -16,16 +16,16 @@ namespace dxvk {
 
         bool Initialize();
 
-        [[nodiscard]] u_short GetAdapterCount() const;
+        [[nodiscard]] uint16_t GetAdapterCount() const;
         [[nodiscard]] NvapiAdapter* GetAdapter() const;
-        [[nodiscard]] NvapiAdapter* GetAdapter(u_short index) const;
+        [[nodiscard]] NvapiAdapter* GetAdapter(uint16_t index) const;
         [[nodiscard]] NvapiAdapter* GetAdapter(const LUID& luid) const;
         [[nodiscard]] bool IsAdapter(NvapiAdapter* handle) const;
 
-        [[nodiscard]] NvapiOutput* GetOutput(u_short index) const;
+        [[nodiscard]] NvapiOutput* GetOutput(uint16_t index) const;
         [[nodiscard]] bool IsOutput(NvapiOutput* handle) const;
-        [[nodiscard]] short GetPrimaryOutputId() const;
-        [[nodiscard]] short GetOutputId(const std::string& displayName) const;
+        [[nodiscard]] int16_t GetPrimaryOutputId() const;
+        [[nodiscard]] int16_t GetOutputId(const std::string& displayName) const;
 
       private:
         ResourceFactory& m_resourceFactory;
diff --git a/src/util/util_error.h b/src/util/util_error.h
index 0fadac6..ea34302 100644
--- a/src/util/util_error.h
+++ b/src/util/util_error.h
@@ -3,8 +3,8 @@
 #include "../nvapi_private.h"
 
 namespace dxvk {
-    inline std::string fromErrorNr(const short errorNr) {
-        static const std::map<short, std::string> errors{
+    inline std::string fromErrorNr(const int16_t errorNr) {
+        static const std::map<int16_t, std::string> errors{
             {-1, "NVAPI_ERROR"},
             {-2, "NVAPI_LIBRARY_NOT_FOUND"},
             {-3, "NVAPI_NO_IMPLEMENTATION"},