Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace various std::map with UNORDERED_MAP + various cleanups
This is part 2 for 5f084cd Other improvements: * Use the defined ItemGroupList when used * make Client::checkPrivilege const * inline some trivial functions * Add ActiveObjectMap typedef * Add SettingsEntries typedef
- Loading branch information
Showing
23 changed files
with
110 additions
and
167 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
Oops, something went wrong.
613797a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think your commit might have broken something. When I try to compile on master, I get:
/home/codehero/code/minetest/src/content_cao.cpp: In constructor ‘GenericCAO::GenericCAO(IGameDef*, ClientEnvironment*)’: /home/codehero/code/minetest/src/content_cao.cpp:582:21: error: no matching function for call to ‘std::unordered_map<std::__cxx11::basic_string<char>, irr::core::vector2d<irr::core::vector3d<float> > >::unordered_map(std::map<std::__cxx11::basic_string<char>, irr::core::vector2d<irr::core::vector3d<float> > >)’ m_is_visible(false) ^ In file included from /usr/include/c++/6.2.1/unordered_map:48:0, from /home/codehero/code/minetest/src/util/cpp11_container.h:24, from /home/codehero/code/minetest/src/itemgroup.h:24, from /home/codehero/code/minetest/src/content_cao.h:27, from /home/codehero/code/minetest/src/content_cao.cpp:26:
But if I checkout 5f084cd, the code compiles without errors.
613797a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
613797a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@C0DEHERO i have the fix. Strangely travis didn't report it. I will look at compilation matrix to ensure C++11 builds are enabled, and it compiled also in my clion with gcc 6.2... but now i'm able to reproduce.
This is now fixed. Thanks
613797a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. For the record, I was just using the default build instructions for Linux. So I'm pretty sure it used g++.