Skip to content

Comments

More namespace cleaning.#718

Merged
Yangqing merged 5 commits intoBVLC:devfrom
Yangqing:dev
Jul 18, 2014
Merged

More namespace cleaning.#718
Yangqing merged 5 commits intoBVLC:devfrom
Yangqing:dev

Conversation

@Yangqing
Copy link
Member

More namespace cleaning. Basically, I am removing all scattered using statements and putting them into common.hpp. For some platforms this allows one to more easily change namespaces (e.g. when one uses a custom string implementation).

Since this most likely wont' affect other code, I'll abuse my privilege a little bit and merge when travis passes.

Copy link
Contributor

Choose a reason for hiding this comment

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

rm these 2 usings?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@jeffdonahue
Copy link
Contributor

if you want to save time you can stop the build of your first commit with the "X" button in the upper right corner (during the day on weekdays, Travis seems to take forever to just start up)

@Yangqing
Copy link
Member Author

Thanks Jeff. There are some compilation error in one of the test files, will take a look later today.

@Yangqing
Copy link
Member Author

Merging :)

Yangqing added a commit that referenced this pull request Jul 18, 2014
More namespace cleaning.
@Yangqing Yangqing merged commit afc6b4e into BVLC:dev Jul 18, 2014
@shelhamer
Copy link
Member

@Yangqing please synchronize with dev by git pull --rebase instead of merge to cleanly resolve conflicts and avoid spurious commits like b45952c. I am going to force push dev to squash these changes. Thanks!

shelhamer pushed a commit to shelhamer/caffe that referenced this pull request Jul 18, 2014
@Yangqing
Copy link
Member Author

@shelhamer Evan, it seems that some change got lost in the procedure... For example io.cpp still has all the using std statements:

https://github.com/Yangqing/caffe/blob/dev/src/caffe/util/io.cpp

Could you take a look? I am not a git expert :(

@Yangqing
Copy link
Member Author

Never mind, I misread your above comment - will do a separate pull request when I've figured all details on compiling (see my private mail).

@shelhamer
Copy link
Member

Wait, did a change go missing or not? Sorry if I dropped a diff! Perhaps I
shouldn't adjust history while traveling.

Le samedi 19 juillet 2014, Yangqing Jia notifications@github.com a écrit :

Never mind, I misread the above email - will do a separate pull request
when I've figured all details on compiling (see my private mail).


Reply to this email directly or view it on GitHub
#718 (comment).

@jeffdonahue
Copy link
Contributor

Yeah, some changes were missing -- I put up the diff as a PR: jeffdonahue#4 (a pull request of Yangqing's original merge to your rewrite)

@shelhamer
Copy link
Member

Sorry everybody.

Le dimanche 20 juillet 2014, Jeff Donahue notifications@github.com a
écrit :

Yeah, some changes were missing -- I put up the diff as a PR:
jeffdonahue#4 jeffdonahue#4 (a pull
request of Yangqing's original merge to your rewrite)


Reply to this email directly or view it on GitHub
#718 (comment).

mitmul pushed a commit to mitmul/caffe that referenced this pull request Sep 30, 2014
RazvanRanca pushed a commit to RazvanRanca/caffe that referenced this pull request Nov 4, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants