diff options
| author |  darkf | 2014-12-29 19:47:41 -0800 |
|---|---|---|
| committer | darkf | 2014-12-29 19:47:41 -0800 |
| commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
| tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /src/common/linear_disk_cache.h | |
| parent | Add comment regarding __WIN32__ in SkyEye code (diff) | |
| parent | Merge pull request #367 from bunnei/usat_ssat (diff) | |
| download | yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.gz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.xz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.zip | |
Fix merge conflicts
Diffstat (limited to 'src/common/linear_disk_cache.h')
| -rw-r--r-- | src/common/linear_disk_cache.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/linear_disk_cache.h b/src/common/linear_disk_cache.h index f4263f72a..74ce74aba 100644 --- a/src/common/linear_disk_cache.h +++ b/src/common/linear_disk_cache.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | // Copyright 2013 Dolphin Emulator Project | 1 | // Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project |
| 2 | // Licensed under GPLv2 | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| @@ -70,7 +70,7 @@ public: | |||
| 70 | // good header, read some key/value pairs | 70 | // good header, read some key/value pairs |
| 71 | K key; | 71 | K key; |
| 72 | 72 | ||
| 73 | V *value = NULL; | 73 | V *value = nullptr; |
| 74 | u32 value_size; | 74 | u32 value_size; |
| 75 | u32 entry_number; | 75 | u32 entry_number; |
| 76 | 76 | ||