diff options
| author | 2014-12-15 22:52:35 -0500 | |
|---|---|---|
| committer | 2014-12-15 22:52:35 -0500 | |
| commit | cdfa7157eb1199056a5ccb8913fe4e89d3e30f68 (patch) | |
| tree | effcafa78b587e5994d2c282a32195b6988d156c | |
| parent | Merge pull request #285 from lioncash/uxtab16 (diff) | |
| parent | Comment out empty arrays causing compile errors in MSVC (diff) | |
| download | yuzu-cdfa7157eb1199056a5ccb8913fe4e89d3e30f68.tar.gz yuzu-cdfa7157eb1199056a5ccb8913fe4e89d3e30f68.tar.xz yuzu-cdfa7157eb1199056a5ccb8913fe4e89d3e30f68.zip | |
Merge pull request #286 from yuriks/msvc-fix
Comment out empty arrays causing compile errors in MSVC
| -rw-r--r-- | src/core/hle/service/am_app.cpp | 7 | ||||
| -rw-r--r-- | src/core/hle/service/cecd_u.cpp | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/core/hle/service/am_app.cpp b/src/core/hle/service/am_app.cpp index 05c34832b..b8b06418c 100644 --- a/src/core/hle/service/am_app.cpp +++ b/src/core/hle/service/am_app.cpp | |||
| @@ -11,13 +11,14 @@ | |||
| 11 | 11 | ||
| 12 | namespace AM_APP { | 12 | namespace AM_APP { |
| 13 | 13 | ||
| 14 | const Interface::FunctionInfo FunctionTable[] = { | 14 | // Empty arrays are illegal -- commented out until an entry is added. |
| 15 | }; | 15 | //const Interface::FunctionInfo FunctionTable[] = { }; |
| 16 | |||
| 16 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 17 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 17 | // Interface class | 18 | // Interface class |
| 18 | 19 | ||
| 19 | Interface::Interface() { | 20 | Interface::Interface() { |
| 20 | Register(FunctionTable, ARRAY_SIZE(FunctionTable)); | 21 | //Register(FunctionTable, ARRAY_SIZE(FunctionTable)); |
| 21 | } | 22 | } |
| 22 | 23 | ||
| 23 | } // namespace | 24 | } // namespace |
diff --git a/src/core/hle/service/cecd_u.cpp b/src/core/hle/service/cecd_u.cpp index d72f1da3f..25d903516 100644 --- a/src/core/hle/service/cecd_u.cpp +++ b/src/core/hle/service/cecd_u.cpp | |||
| @@ -11,13 +11,14 @@ | |||
| 11 | 11 | ||
| 12 | namespace CECD_U { | 12 | namespace CECD_U { |
| 13 | 13 | ||
| 14 | const Interface::FunctionInfo FunctionTable[] = { | 14 | // Empty arrays are illegal -- commented out until an entry is added. |
| 15 | }; | 15 | //const Interface::FunctionInfo FunctionTable[] = { }; |
| 16 | |||
| 16 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 17 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 17 | // Interface class | 18 | // Interface class |
| 18 | 19 | ||
| 19 | Interface::Interface() { | 20 | Interface::Interface() { |
| 20 | Register(FunctionTable, ARRAY_SIZE(FunctionTable)); | 21 | //Register(FunctionTable, ARRAY_SIZE(FunctionTable)); |
| 21 | } | 22 | } |
| 22 | 23 | ||
| 23 | } // namespace | 24 | } // namespace |