Commit Graph

16646 Commits

Author SHA1 Message Date
Tillmann Karras
efe71e686b DiscIO: implement CISOBlob::GetDataSize()
This is a best-effort approach, since the CISO format does not save the
original file size.
2015-10-12 02:33:38 +02:00
Tillmann Karras
1a8e2e16e3 DiscIO: implement WbfsBlob::GetDataSize() 2015-10-12 02:33:04 +02:00
Tillmann Karras
a92b4bda95 DiscIO: fix reading the last sector in WBFS
Instead of rounding down, round up.
2015-10-12 02:31:51 +02:00
Tillmann Karras
3a2efc9f4f DiscIO: merge initial WBFS reads 2015-10-12 02:31:51 +02:00
Tillmann Karras
f416106eec DiscIO: pre-swap WLBA 2015-10-12 02:31:51 +02:00
Tillmann Karras
b1100e4aa0 DiscIO: use std::min() in WBFS 2015-10-12 02:31:51 +02:00
Tillmann Karras
4eace2b49e CMake: simplify FindMiniupnpc.cmake
miniupnpc.h provides MINIUPNPC_API_VERSION since 1.7 and we require 1.7
or later, so there is no reason to have version detection code for older
versions.
2015-10-12 02:26:35 +02:00
Tillmann Karras
9f8981c7c0 VertexLoaderUtils: remove simple wrapper functions 2015-10-11 23:40:50 +02:00
Tillmann Karras
ae999cb43c Wiimote: simplify DoState() parameters 2015-10-11 23:37:34 +02:00
Scott Mansell
645e4cbbee PixelShaderGen: Use arrays of texture samplers. 2015-10-12 05:06:39 +13:00
Christian Widmer
b99d1a0a20 Fix OProfile discovery and drop bfd dependency
Adds a cmake module to correctly discover OProfile and adjusts the
corresponding CMakeLists to make use of it. Additionally removes
linking against the bfd library when compiling with OProfile because
Dolphin does not use it.
2015-10-11 16:27:03 +02:00
flacs
c4fe2cd287 Merge pull request #3147 from ShadowsFriend/qtinstall_fix
DolphinQt: Install binary for systems not matching APPLE
2015-10-11 15:54:02 +02:00
flacs
94d20131bb Merge pull request #3151 from ShadowsFriend/memtools_unistd
Include unistd.h in memtools.cpp to fix nopch
2015-10-11 15:52:40 +02:00
flacs
e389a3cafe Merge pull request #3131 from delroth/fifo-pad
FifoDataFile: Revert PadFile changes from 4.0-1127.
2015-10-11 15:50:24 +02:00
flacs
a7b6ae8f2c Merge pull request #3160 from Tilka/style
Misc. style fixes
2015-10-11 15:36:06 +02:00
flacs
f3c88137e7 Merge pull request #2798 from lioncash/search
Debugger: Use wxSearchCtrls instead of wxTextCtrl for address searching.
2015-10-11 15:29:59 +02:00
flacs
fe164e3a90 Merge pull request #3137 from lioncash/namespace
StreamADPCM: Convert into a namespace
2015-10-11 15:27:45 +02:00
flacs
a9d6448777 Merge pull request #3150 from lioncash/iter
NANDContentLoader: Replace a string rbegin() call with a back() call
2015-10-11 15:26:51 +02:00
Tillmann Karras
99228633c3 OGL: simplify AA modes initialization 2015-10-10 22:51:31 +02:00
Tillmann Karras
0f1b287402 Misc. style fixes 2015-10-10 17:44:42 +02:00
Tillmann Karras
19a490a82d Linux: detect perf and default map dir to /tmp
This obviously only works when Dolphin is run by perf rather than being
started separately.
2015-10-10 16:42:53 +02:00
degasus
d4e447555e VideoSW: Wipe alpha on bypass EFB
Alpha must not be displayed.
2015-10-10 11:45:39 +02:00
Christian Widmer
1dd4c93f0c DolphinQt: Install binary for systems not matching APPLE 2015-10-09 11:11:41 +02:00
Christian Widmer
6eb6fa9bf8 Include unistd.h in memtools.cpp to fix nopch
Fixes falling back to generic on non-windows builds with PCH disabled
leading to runtime crashes and the pagefault test failing. Thanks to
HdkR!
2015-10-09 11:08:17 +02:00
Lioncash
737de5e115 StreamADPCM: Convert into a namespace
No need to have a class with only static member functions
2015-10-08 19:46:55 -04:00
Lioncash
66a576548c ConfigManager: Get rid of an unnecessary smart-pointer get() call 2015-10-08 19:36:28 -04:00
Scott Mansell
71d7cd6b9d DolphinWX: Make UpdateLog() return in a finite time.
After fixing the deadlock in #3006, it is now possible for log
messages to flood in faster than UpdateLog can render them.

This causes it to never return, locking up the gui thread and
filling the windows message queue (which triggers the stack
overflow bug in older versions of Wx)
2015-10-09 12:14:04 +13:00
Lioncash
307ef88af6 DSPEmitter: Rename Default() to FallBackToInterpreter() 2015-10-08 12:45:14 -04:00
Lioncash
5f181957b3 NANDContentLoader: Replace a string rbegin() call with a back() call 2015-10-07 09:47:26 -04:00
catzilla4
867a1beb9f Added some headers to allow Dolphin to compile in my environment. 2015-10-06 19:09:57 -05:00
shuffle2
ec28d7df92 Merge pull request #3144 from lioncash/dsp
DSPIntCCUtil: Minor changes
2015-10-06 13:03:11 -07:00
shuffle2
1c97da4942 Merge pull request #3132 from sepalani/fix_mbedtls
mbedTLS: fix blocking read
2015-10-06 13:01:57 -07:00
Christian Widmer
1fc1f00162 Include cstring in Hash.cpp to fix building without PCH 2015-10-06 14:59:56 +02:00
Lioncash
f53d060d70 DSPIntCCUtil: Remove unused function GetMultiplyModifier 2015-10-05 19:40:11 -04:00
Lioncash
1a989985c1 DSPIntCCUtil: Mark translation local functions as static 2015-10-05 19:39:09 -04:00
Sepalani
8efd5d1a74 WSAGetLastError: fix return value 2015-10-06 00:15:20 +02:00
Chris Burgener
5edb2bfea1 Fix wxWidgets Error in About Window 2015-10-05 13:36:53 -04:00
shuffle2
3b1375f78c Merge pull request #3134 from lioncash/namespace
CPU: Convert CCPU into a namespace
2015-10-04 14:22:50 -07:00
shuffle2
55ea9e77e6 Merge pull request #3135 from lioncash/dsp
DSPCore: Convert defines over to enums
2015-10-04 14:22:02 -07:00
shuffle2
552c1f51d8 Merge pull request #3068 from mickdermack/pr-block-input
Block WX input when detecting controls
2015-10-04 14:19:44 -07:00
Lioncash
b730ad4406 DSPCore: Convert defines over to enums 2015-10-04 16:42:30 -04:00
Lioncash
ef1cc2cec4 CPU: Convert CCPU into a namespace
There's not much point to a class with only static member functions.
2015-10-04 15:15:10 -04:00
Lioncash
ba0a3c520b EXI_DeviceAGP: Remove unnecessary headers 2015-10-04 13:13:32 -04:00
Fog
471c835546 Add Frame Advance Hold Hotkey Functionality 2015-10-04 12:14:36 -04:00
Michael Ehrenreich
b4411bd2ef Block WX input when detecting controls 2015-10-04 14:50:28 +02:00
Pierre Bourdon
a2b3cdc393 FifoDataFile: Revert PadFile changes from 4.0-1127.
Fixes #9006.
2015-10-04 13:53:01 +02:00
Sepalani
5be64d39b0 mbedTLS: fix blocking read 2015-10-04 12:24:25 +02:00
shuffle2
6d4128ddcc Merge pull request #3128 from lioncash/unique
ControllerEmu: Use make_unique over raw new
2015-10-03 19:08:00 -07:00
shuffle2
569d25d9b4 Merge pull request #3129 from lioncash/mailbox
DSPHWInterface: Use an enum for indicating mailbox type
2015-10-03 19:04:35 -07:00
shuffle2
eb07038723 Merge pull request #3130 from rohit-n/sign-compare
VideoCommon: Silence -Wsign-compare warnings.
2015-10-03 18:49:38 -07:00
Rohit Nirmal
18f0831861 VideoCommon: Silence -Wsign-compare warnings. 2015-10-03 20:32:16 -05:00
shuffle2
0fdaacc7e0 Merge pull request #2738 from lioncash/bitfield
Common: Fix BitField mask generation.
2015-10-03 18:21:24 -07:00
shuffle2
81414b4fa2 Merge pull request #3076 from void-ghost/stereo3d_presets
Stereo3d presets
2015-10-03 18:10:23 -07:00
shuffle2
b926061f64 Merge pull request #3095 from void-ghost/savestate_race_condition_fix
SaveState: Fix for race condition in SaveAs(...)
2015-10-03 18:08:33 -07:00
shuffle2
4fb90bf9f6 Merge pull request #3115 from lioncash/ifx
DSPCore: Minor changes
2015-10-03 18:03:26 -07:00
shuffle2
06379cc3a0 Merge pull request #3113 from lioncash/input
InputCommon: Get rid of multiple identical define macros
2015-10-03 18:01:36 -07:00
shuffle2
a6f04b0e15 Merge pull request #3091 from Tilka/mbedtls
Update mbed TLS (PolarSSL)
2015-10-03 18:00:58 -07:00
shuffle2
8bb35c8588 Merge pull request #3083 from JosJuice/ipc-ticks
Use correct GetTicksPerSecond() value in IPC delays
2015-10-03 17:56:57 -07:00
shuffle2
9878004871 Merge pull request #3105 from phire/dont_block
ALSA: Don't block on Clear() call.
2015-10-03 17:55:26 -07:00
shuffle2
f5c88fc1a9 Merge pull request #3125 from JosJuice/di-callback-pointer
Simplify getting DI pointer in IOCtl callback
2015-10-03 17:52:58 -07:00
shuffle2
b4be34bc68 Merge pull request #3124 from dolphin-emu/shuffle2-patch-1
Fix WiiSockMan::DecodeError
2015-10-03 14:59:20 -07:00
Lioncash
9c73d63d40 DSPHWInterface: Use an enum for indicating mailbox type 2015-10-03 17:53:24 -04:00
Lioncash
fa05710f2f ControllerEmu: Use make_unique over raw new 2015-10-03 15:37:25 -04:00
Lioncash
5464e698fc Merge pull request #3102 from rohit-n/build-pch
Fix building with PCH disabled.
2015-10-03 13:30:51 -04:00
JosJuice
bf2676a1b1 Simplify getting DI pointer in IOCtl callback
Gets rid of an odd code construct, and fixes the "Trying to run two DI
devices at once" ERROR_LOG appearing at the wrong times.
2015-10-03 11:35:29 +02:00
shuffle2
f33fae574f Fix WiiSockMan::DecodeError 2015-10-03 01:56:42 -07:00
Scott Mansell
a10a3ecbac ALSA: Don't block on Clear() call.
snd_pcm_writei() is meant to block block until all samples are written,
but apparently in some situations it can block for much longer, prehaps
even a infinite time, in the case of virtual machine FifoCI runs in.

Because it grabed a mutex before blocking, it could also block the
Clear() call for an infinite length of time, blocking dolphin's emu
thread.

snd_pcm_writei() also takes 10-15 seconds if you run dolphin under GDB
and can randomly take 5 or so seconds during normal usage.

By moving all the pause code to the ALSA thread, Clear() no-longer
blocks and everyone keeps their sanity.
2015-10-03 16:31:55 +13:00
flacs
6658d21215 Merge pull request #3121 from lioncash/pch
pch: Update MSVC version check
2015-10-03 05:21:17 +02:00
Scott Mansell
f1a43dc6d4 Merge pull request #3118 from lioncash/junk
WiimoteEmu: Get rid of an unused clamp function
2015-10-03 16:21:00 +13:00
Scott Mansell
bcee41b65d Merge pull request #3123 from lioncash/null
Core: Replace 0 literals with nullptr
2015-10-03 16:19:46 +13:00
Rohit Nirmal
6001366aac Alsa: Silence -Wsign-compare warning. 2015-10-02 21:10:06 -05:00
Lioncash
0f6c4653a4 Core: Replace 0 literals with nullptr 2015-10-02 22:06:17 -04:00
Lioncash
aeee5be5ef pch: Update MSVC version check 2015-10-02 20:51:23 -04:00
Lioncash
a30681834c InputCommon: Use NSNumber numeric literals in Obj-C code 2015-10-02 13:23:46 -04:00
Lioncash
5d8e422d82 WiimoteEmu: Get rid of an unused clamp function 2015-10-02 10:33:29 -04:00
Lioncash
75907d83c6 DSPCore: Get rid of division for determining array size in VerifyRoms 2015-10-01 11:49:30 -04:00
Lioncash
73f312863d DSPCore: Compress common fill loops into std::fill 2015-10-01 11:23:01 -04:00
Scott Mansell
58d893e56f Merge pull request #3075 from waddlesplash/no-regexp
FileSearch: Don't use RegExes, just do string comparisons.
2015-10-02 04:00:23 +13:00
Lioncash
ccc3cd884e DSPCore: Use std::array to represent ifx_regs 2015-10-01 10:26:16 -04:00
Lioncash
7f9cb1b6a8 ControllerConfigDiag: Remove superfluous arguments 2015-10-01 09:37:48 -04:00
Lioncash
b3da7e81bd ControllerConfigDiag: Amend button sizing issues 2015-10-01 09:34:32 -04:00
Lioncash
449c57a8e0 InputCommon: Get rid of multiple identical define macros 2015-10-01 08:45:22 -04:00
flacs
696d6eae09 Merge pull request #3108 from lioncash/cstyle-array
ChunkFile: Provide additional helpers for C-style arrays
2015-10-01 01:55:54 +02:00
Lioncash
a10be26972 Tev: Don't savestate Zero16
It's an array of zeroes. There's no need.
2015-09-30 19:45:50 -04:00
Lioncash
c6678687b0 ChunkFile: Provide additional helpers for C-style arrays
Gets rid of magic numbers in cases where the array size is known at compile time.
This is also useful for future entries that are stack allocated arrays as these
functions prevent incorrect sizes being provided.
2015-09-30 19:45:46 -04:00
flacs
6305437327 Merge pull request #3110 from booto/alsa-buffer-type
AlsaSound: fix buffer type, clean up macros
2015-10-01 00:01:26 +02:00
Lioncash
473188a2c3 WII_IPC_HLE_Device_fs: Get rid of a pointer cast 2015-09-30 16:04:53 -04:00
Ryan Houdek
0764971feb Merge pull request #3109 from OrdinaryMagician/miniupnpc14
Update to support miniupnpc 1.9 API version 14
2015-09-30 11:08:58 -04:00
Marisa Kirisame
8c5744bca7 miniupnpc API version 14 changed the upnpDiscover functions, adding an argument for TTL (should default to 2)
this enables support for that should the build system have that specific version installed, the miniupnpc bundled in the project is unchanged
2015-09-30 16:50:58 +02:00
Ryan Houdek
ebf2420c6b Merge pull request #3057 from booto/finicky-vert-beam-position
VI: Fix vert beam position inaccuracy
2015-09-30 08:26:31 -04:00
booto
6c28ea58ab AlsaSound: fix buffer type, clean up macros 2015-09-30 19:14:03 +08:00
flacs
16957fcaec Merge pull request #3107 from lioncash/pragma
TextureDecoder_x64: Remove now-unnecessary clang #pragma warning suppression
2015-09-29 19:53:12 +02:00
booto
ea6af0e98b VI: Fix vert beam position inaccuracy 2015-09-30 00:21:33 +08:00
Lioncash
50a7390622 TextureDecoder_x64: Remove unnecessary commented out header 2015-09-29 11:04:00 -04:00
Lioncash
80c7e3ebc0 TextureDecoder_x64: Remove clang warning suppression
This was an issue two years ago on clang 3.3
2015-09-29 11:00:59 -04:00
Lioncash
d6ff75d71d OGL: Remove unnecesary FPSCounter include from Render.cpp 2015-09-29 10:01:38 -04:00
Lioncash
4a981e3a04 FPSCounter: Change Update's return type to void
Its returned value is never used.
2015-09-29 10:01:37 -04:00
Lioncash
55c7754738 FPSCounter: Give the refresh interval a concrete type 2015-09-29 10:01:37 -04:00
Lioncash
e82b6a8532 FPSCounter: Direct initialize class members 2015-09-29 10:01:37 -04:00
Lioncash
bf23fcfc1f FPSCounter: Don't provide direct access to m_fps 2015-09-29 09:43:03 -04:00
Tillmann Karras
2f6f30a939 Fix -Wuninitialized warnings 2015-09-29 04:27:27 +02:00
flacs
43e60073d1 Merge pull request #3100 from lioncash/printf
Get rid of some casts used with logging for size_t
2015-09-29 03:50:48 +02:00
flacs
d5ec7124e4 Merge pull request #3099 from lioncash/banner
VolumeGC: Get rid of banner pointer casts
2015-09-29 03:49:08 +02:00
flacs
aaa48e19fe Merge pull request #3097 from JosJuice/blob-type
Fix blob type detection for game right-click menu
2015-09-29 03:46:29 +02:00
Rohit Nirmal
3b75f45cf6 Fix building with PCH disabled. 2015-09-28 11:51:08 -05:00
Lioncash
311c76647d Get rid of some casts used with logging for size_t
Replaces them with the now-valid %z specifiers
2015-09-28 08:43:53 -04:00
Lioncash
7317dd4be2 VolumeGC: Get rid of banner pointer casts
Prefer reading the data into the reified struct instead.
2015-09-28 04:31:43 -04:00
shuffle2
2cb5c41fed HostGetString: Actually fill a string with data 2015-09-28 05:40:52 +02:00
Matthew Parlane
ba96ca289d Merge pull request #3034 from waddlesplash/new-qt
QtCompile.props: Update for Qt 5.5.
2015-09-28 15:17:17 +13:00
JosJuice
21cb13828c Fix blob type detection for game right-click menu
I forgot to update it after changing how IsCompressed() works.
Also, checking file name extensions is a bad way of checking blob types.
2015-09-27 21:06:19 +02:00
JosJuice
be7e0554d2 DiscIO: Add a way to get blob type 2015-09-27 20:54:31 +02:00
ghost
cd19d5392e SaveState: Fix for race condition ("wait" didn't actually waited for file to flush/close).
g_compressAndDumpStateSyncEvent was Set() before destruction of file object (i.e. before flushing changes and closing file).

Also, adds Common::ScopeGuard wrapper for RAII.
2015-09-27 21:40:32 +03:00
waddlesplash
06c6f60f5b OGL: Use SplitPath() instead of std::regex. 2015-09-27 13:26:19 -04:00
waddlesplash
5643fe5d1f FileSearch: Don't use RegExs, just do string comparisons.
Nothing used the RegEx feature of FileSearch, and GCC < 4.9
doesn't support C++11 RegEx properly, so get rid of it.
2015-09-27 13:25:51 -04:00
Scott Mansell
ce493b897d Merge pull request #2271 from revel8n/fixes
Fix for alignment of zero-length files within directory based virtual disk
2015-09-28 05:28:38 +13:00
Scott Mansell
be3851b72e Merge pull request #3090 from LPFaint99/gcifolder
GCI Folder: Skip 'header-only' writes
2015-09-28 05:26:12 +13:00
Scott Mansell
af327aec79 Merge pull request #3036 from mimimi085181/hash-respecting-stride
Respect the stride for efb copies when hashing them
2015-09-28 05:23:55 +13:00
Scott Mansell
4817118028 Merge pull request #3084 from JosJuice/cpu-core-clock
SystemTimers: Don't name non-constant variables as if they are constant
2015-09-28 05:22:54 +13:00
flacs
34c020352f Merge pull request #3092 from JosJuice/compressed-blobs
Display all compressed formats in blue in GUI
2015-09-27 12:57:19 +02:00
Lioncash
457a398c33 MemoryWindow: Adjust control alignment
Aligns controls so that their widths remain the same with one another
2015-09-26 22:46:57 -04:00
Lioncash
5aa19ad051 MemoryWindow: Change the address search wxTextCtrl into a wxSearchCtrl 2015-09-26 22:46:53 -04:00
Lioncash
7ba171a497 CodeWindow: Ignore search error highlighting on empty string
Doesn't make sense to flag these as errors, since someone might search for another address.
2015-09-26 22:38:08 -04:00
Lioncash
6866373202 CodeWindow: Replace wxStaticText/wxTextCtrl combo with a wxSearchCtrl
Same thing, one control.
2015-09-26 22:38:07 -04:00
flacs
8ea9b07b59 Merge pull request #3093 from lioncash/header_shuffle
Common: Trim Common.h
2015-09-27 03:18:03 +02:00
revel8n
d4c2ca46a4 - Fix for alignment of 0-length files when volume directory is created from directory on disk
Updating constant value representation

Explicitly state data type in std:max usage
2015-09-26 18:29:29 -05:00
Lioncash
cc036ca86c Common: Remove other Common prefixed headers from Common.h 2015-09-26 18:51:58 -04:00
Lioncash
19ac565e0d Common: Move asserts to their own header 2015-09-26 18:51:27 -04:00
Lioncash
867df74b52 Common: Remove strdup define
It's not used anywhere.
2015-09-26 18:50:42 -04:00
Lioncash
1d42db2439 Common: Move NonCopyable to its own header 2015-09-26 18:50:35 -04:00
Lioncash
bb927ad738 Atomic_GCC: Throw out old code 2015-09-26 15:59:36 -04:00
Lioncash
d67ea484f7 Common: Get rid of compiler semantic asserts
They were never used.
2015-09-26 15:57:13 -04:00
mimimi085181
e24b8c4ab7 Respect the stride for efb copies when hashing them 2015-09-26 20:19:02 +02:00
Scott Mansell
a91810ba3b Merge pull request #3042 from booto/audio-timing
AI: reduce overhead of sample counter
2015-09-27 05:03:55 +13:00
Ryan Houdek
be667e7de8 Merge pull request #3035 from aserna3/SSAAImprovements
Improved OGL and D3D's AA options in UI
2015-09-26 09:27:39 -04:00
JosJuice
6935d28112 Display all compressed formats in blue in GUI
In the past, only GCZ was shown as compressed, not CISO and WBFS.
2015-09-26 15:24:29 +02:00
JosJuice
94ee720a07 Rename IsCompressedBlob to IsGCZBlob for clarity
GCZ is just one of the several compressed formats that Dolphin supports.
2015-09-26 14:46:53 +02:00
LPFaint99
ddc523b81d GCI Folder: Skip 'header-only' writes
issue #8961
2015-09-25 22:12:40 -07:00
Tillmann Karras
f6795466e7 mbedTLS: adapt Dolphin code 2015-09-26 07:09:19 +02:00
Anthony Serna
df189c3ea3 Improved D3D and OGL AA option UI
Removed Quality Levels from D3D AA options

Dropdown text now shows whether you're applying MSAA or SSAA

Added a description for SSAA

Moved SSAA checkbox

Cleaned up AA in backends slightly. Supported modes is now a list of ints.
2015-09-25 09:05:18 -07:00
Tillmann Karras
ac5f56df7e mbedTLS: adapt Dolphin's Visual Studio files 2015-09-25 03:46:41 +02:00
Tillmann Karras
063446c46f mbedTLS: run rename.pl script and fix errors 2015-09-25 03:46:41 +02:00
Lioncash
7e69a0ce79 CommandProcessor: Remove unused extern 2015-09-24 11:35:46 -04:00
JosJuice
ab8f75f000 SystemTimers: Don't name non-constant variables as if they are constant 2015-09-24 14:57:25 +02:00
ghost
7c1565b201 VideoConfig/LocalConfig/HotkeyManager: Added hotkeys for switching stereo-3d presets.
Added 3 depth/convergence presets. They are adjustable via (existing) hotkeys - changes to depth and convergence are applied to current preset.
Added 3 hotkeys for activating presets. Added hotkey for toggle between first and second preset.
Added OSD message for convergence/depth changes.
Presets are saved into per-game configs.
2015-09-24 15:19:55 +03:00
Lioncash
d694994874 BoundingBox: Remove unnecessary headers 2015-09-24 03:19:43 -04:00
Tillmann Karras
aba083dd3a FifoPlayer: remove leftover code 2015-09-24 05:09:41 +02:00
flacs
c1ee0e7829 Merge pull request #3078 from lioncash/titleid
DiscIO: Do swapping in GetTitleID implementations
2015-09-23 18:56:57 +02:00
flacs
cf131b133e Merge pull request #3079 from lioncash/emit
x64Emitter: Minor changes
2015-09-23 18:55:24 +02:00
flacs
40da69d5a2 Merge pull request #3081 from lioncash/si-enum
SI_Device: Convert define constants over to enums
2015-09-23 18:55:10 +02:00
Rohit Nirmal
a48e425f41 Silence -Wshadow warning. 2015-09-23 11:02:24 -05:00