Rename BLOB to species_BLOB #38134
Merged
Rename BLOB to species_BLOB #38134
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ZhilkinSerg
added
[C++]
kevingranade
added a commit
to kevingranade/Cataclysm-DDA
that referenced
this pull request
Feb 25, 2020
ZhilkinSerg
pushed a commit
that referenced
this pull request
Feb 25, 2020
* Revert "Moved more string consts into single file (#38237)" This reverts commit 4987742. * Revert "Moved more string consts into single file (#38220)" This reverts commit d9c6079. * Revert "Move string consts into single file (#38195)" This reverts commit b1b48ba. * Revert "More string consts into single file (#38189)" This reverts commit 4fffd96. * Revert "More string consts into single file (#38183)" This reverts commit 05940bf. * Revert "Move string consts into single file (#38184)" This reverts commit 19c5698. * Revert "Move string consts into single file (#38181)" This reverts commit 55cabb7. * Revert "Move more string consts into single file (#38175)" This reverts commit 571efb2. * Revert "Merge pull request #38176 from Ramza13/string_consts_and_more" This reverts commit 9c9835f, reversing changes made to 07995cd. * Revert "Move more string consts into single file (#38169)" This reverts commit 07995cd. * Revert "Merge pull request #38168 from Ramza13/even_more_string_consts" This reverts commit 2bf1c1e, reversing changes made to 24a32c0. * Revert "Merge pull request #38141 from ZhilkinSerg/sa-2020-02-18" This reverts commit 142295b, reversing changes made to f98c67d. * Revert "Move string consts into single file (#38158)" This reverts commit 50059c8. * Revert "Merge pull request #38157 from Ramza13/string_consts_more_flags" This reverts commit 8ec8e78, reversing changes made to 72ef022. * Revert "Move string_consts" This reverts commit 0a6bf67. * Revert "Merge pull request #38146 from Ramza13/battery" This reverts commit 9286722, reversing changes made to e9f1cd7. * Revert "Merge pull request #38134 from AMurkin/rename-blob" This reverts commit 06f72d2, reversing changes made to bcfe074. * Revert "Yet more string consts moved out (#38130)" This reverts commit b5f18f3. * Revert "Merge pull request #38115 from Ramza13/string_consts_game" This reverts commit 9807657, reversing changes made to 036465f. * Fixup to the picked_up * RE-inline item_location initialization * Update character.h * Update item.cpp * Update item.h * Update item_action.cpp * Update item_factory.cpp * Update point.h * Update safemode_ui.cpp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: NonePurpose of change
Should fix errors reported by compiler:
In file included from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/combaseapi.h:153:0, from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/objbase.h:14, from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/ole2.h:17, from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/wtypes.h:12, from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/winscard.h:10, from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/windows.h:97, from src/mingw.thread.h:17, from src/sounds.cpp:57: /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/wtypesbase.h:385:3: error: 'typedef struct tagBLOB BLOB' redeclared as different kind of symbol } BLOB; ^ In file included from src/sounds.cpp:47:0: src/cata_string_consts.h:1367:25: note: previous declaration 'const species_id BLOB' static const species_id BLOB( "BLOB" ); ^ In file included from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/objbase.h:164:0, from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/ole2.h:17, from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/wtypes.h:12, from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/winscard.h:10, from /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/windows.h:97, from src/mingw.thread.h:17, from src/sounds.cpp:57: /home/narc/src/mxe/usr/x86_64-w64-mingw32.static/include/propidl.h:232:9: error: 'BLOB' does not name a type BLOB blob; ^Describe the solution
Rename BLOB to species_BLOB in src/cata_string_consts.h.
Describe alternatives you've considered
None.
Might worth a comment in src/cata_string_consts.h.
Testing
TBD by CI.