diff options
| author | 2015-07-25 12:55:34 -0700 | |
|---|---|---|
| committer | 2015-07-25 12:55:34 -0700 | |
| commit | 24d7c05c8dd96a447699ba5059410d2009fab5c8 (patch) | |
| tree | 5694b07e26e682d5e67cdcf7595c2244fdc5f008 /src | |
| parent | Address error that remained in last merge (diff) | |
| parent | Core\HLE : Fix Warning (diff) | |
| download | yuzu-24d7c05c8dd96a447699ba5059410d2009fab5c8.tar.gz yuzu-24d7c05c8dd96a447699ba5059410d2009fab5c8.tar.xz yuzu-24d7c05c8dd96a447699ba5059410d2009fab5c8.zip | |
Merge pull request #888 from zawata/Warning-Fixes-2
Core\HLE : Fix Warning
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/function_wrappers.h | 2 | ||||
| -rw-r--r-- | src/core/hle/svc.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h index 9294789ec..1a0518926 100644 --- a/src/core/hle/function_wrappers.h +++ b/src/core/hle/function_wrappers.h | |||
| @@ -133,7 +133,7 @@ template<ResultCode func(u32)> void Wrap() { | |||
| 133 | FuncReturn(func(PARAM(0)).raw); | 133 | FuncReturn(func(PARAM(0)).raw); |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | template<ResultCode func(s64*, u32, u32*, s32)> void Wrap(){ | 136 | template<ResultCode func(s64*, u32, u32*, u32)> void Wrap(){ |
| 137 | FuncReturn(func((s64*)Memory::GetPointer(PARAM(0)), PARAM(1), (u32*)Memory::GetPointer(PARAM(2)), | 137 | FuncReturn(func((s64*)Memory::GetPointer(PARAM(0)), PARAM(1), (u32*)Memory::GetPointer(PARAM(2)), |
| 138 | (s32)PARAM(3)).raw); | 138 | (s32)PARAM(3)).raw); |
| 139 | } | 139 | } |
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index bdede964e..bb64fdfb7 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -334,7 +334,7 @@ static ResultCode GetResourceLimit(Handle* resource_limit, Handle process_handle | |||
| 334 | 334 | ||
| 335 | /// Get resource limit current values | 335 | /// Get resource limit current values |
| 336 | static ResultCode GetResourceLimitCurrentValues(s64* values, Handle resource_limit_handle, u32* names, | 336 | static ResultCode GetResourceLimitCurrentValues(s64* values, Handle resource_limit_handle, u32* names, |
| 337 | s32 name_count) { | 337 | u32 name_count) { |
| 338 | LOG_TRACE(Kernel_SVC, "called resource_limit=%08X, names=%p, name_count=%d", | 338 | LOG_TRACE(Kernel_SVC, "called resource_limit=%08X, names=%p, name_count=%d", |
| 339 | resource_limit_handle, names, name_count); | 339 | resource_limit_handle, names, name_count); |
| 340 | 340 | ||
| @@ -350,7 +350,7 @@ static ResultCode GetResourceLimitCurrentValues(s64* values, Handle resource_lim | |||
| 350 | 350 | ||
| 351 | /// Get resource limit max values | 351 | /// Get resource limit max values |
| 352 | static ResultCode GetResourceLimitLimitValues(s64* values, Handle resource_limit_handle, u32* names, | 352 | static ResultCode GetResourceLimitLimitValues(s64* values, Handle resource_limit_handle, u32* names, |
| 353 | s32 name_count) { | 353 | u32 name_count) { |
| 354 | LOG_TRACE(Kernel_SVC, "called resource_limit=%08X, names=%p, name_count=%d", | 354 | LOG_TRACE(Kernel_SVC, "called resource_limit=%08X, names=%p, name_count=%d", |
| 355 | resource_limit_handle, names, name_count); | 355 | resource_limit_handle, names, name_count); |
| 356 | 356 | ||