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

Controller Interface: Remove "using namespace" in header file. #973

Merged
merged 1 commit into from Sep 5, 2014
Merged

Controller Interface: Remove "using namespace" in header file. #973

merged 1 commit into from Sep 5, 2014

Conversation

rohit-n
Copy link
Member

@rohit-n rohit-n commented Sep 5, 2014

No description provided.

@@ -36,7 +36,6 @@
#define CIFACE_USE_SDL
#endif

using namespace ciface::Core;

This comment was marked as off-topic.

@rohit-n
Copy link
Member Author

rohit-n commented Sep 5, 2014

Welp, I screwed something up.

@magcius
Copy link
Member

magcius commented Sep 5, 2014

git fetch origin; git rebase origin/master

@rohit-n
Copy link
Member Author

rohit-n commented Sep 5, 2014

How about now?

@shuffle2
Copy link
Contributor

shuffle2 commented Sep 5, 2014

Looks like it needs the ol' rebase.

@rohit-n
Copy link
Member Author

rohit-n commented Sep 5, 2014

I tried rebasing, but that only caused more problems. I just did a reset --hard and the whitespace was somehow gone (perhaps from a commit --amend that worked again).

Does commit acde4e9 have any issues at the moment? It builds the project fine on my end.

shuffle2 added a commit that referenced this pull request Sep 5, 2014
Controller Interface: Remove "using namespace" in header file.
@shuffle2 shuffle2 merged commit ee450ac into dolphin-emu:master Sep 5, 2014
@rohit-n rohit-n deleted the remove-using-namespace branch September 5, 2014 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants