More namespace cleaning.#718
Conversation
src/caffe/util/upgrade_proto.cpp
Outdated
|
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) |
|
Thanks Jeff. There are some compilation error in one of the test files, will take a look later today. |
… make nvcc unhappy.
Conflicts: src/caffe/common.cpp
|
Merging :) |
More namespace cleaning.
|
@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 :( |
|
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). |
|
Wait, did a change go missing or not? Sorry if I dropped a diff! Perhaps I Le samedi 19 juillet 2014, Yangqing Jia notifications@github.com a écrit :
|
|
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) |
|
Sorry everybody. Le dimanche 20 juillet 2014, Jeff Donahue notifications@github.com a
|
More namespace cleaning.
More namespace cleaning.
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.