Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h #5821

Merged
merged 1 commit into from
Jun 4, 2017

Conversation

nerzhul
Copy link
Member

@nerzhul nerzhul commented May 26, 2017

Requires #5814 to be merged, to review just look at third commit

some long types on unordered_set/map have now typedefs to reduce coding lines

@nerzhul nerzhul added the Maintenance Tasks to keep the codebase and related parts in order, including architectural improvements label May 26, 2017
@nerzhul nerzhul added this to Todo in Minetest C++11 May 26, 2017
@nerzhul nerzhul added this to Feature PR in Minetest 5.0.0 blockers May 26, 2017
@nerzhul
Copy link
Member Author

nerzhul commented May 26, 2017

I will rebase this when the other PR will be merged or if i need to do some modifications

@nerzhul nerzhul requested a review from sfan5 May 26, 2017 17:16
@nerzhul nerzhul added this to the 0.5.0 milestone May 26, 2017
@nerzhul nerzhul moved this from Feature PR to Ready to merge in Minetest 5.0.0 blockers May 26, 2017
@nerzhul nerzhul requested a review from SmallJoker June 4, 2017 07:57
@nerzhul
Copy link
Member Author

nerzhul commented Jun 4, 2017

rebased

@@ -21,14 +21,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "threading/mutex_auto_lock.h"


UNORDERED_MAP<u16, std::vector<v3s16> > FacePositionCache::cache;
std::unordered_map<u16, std::vector<v3s16> > FacePositionCache::cache;
Copy link
Member

@SmallJoker SmallJoker Jun 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either
namespace::container<typename, namespace::container<typename>> or
namespace::container<typename, namespace::container<typename> >

You mixed both notations in this PR.
EDIT: Especially in content_sao.cpp

@nerzhul
Copy link
Member Author

nerzhul commented Jun 4, 2017 via email

@nerzhul nerzhul merged commit a98baef into minetest:master Jun 4, 2017
@nerzhul nerzhul moved this from Todo to Done in Minetest C++11 Jun 4, 2017
@nerzhul nerzhul moved this from Ready to merge to Done in Minetest 5.0.0 blockers Jun 4, 2017
@nerzhul nerzhul deleted the cpp11_maps_nullptr branch June 6, 2017 22:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Maintenance Tasks to keep the codebase and related parts in order, including architectural improvements One approval ✅ ◻️
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants