-
Notifications
You must be signed in to change notification settings - Fork 20
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
Refactoring .hpp -> .h, .cpp and remove class templates #45
Conversation
Steps to create new files while preserving the history:
|
I manually recreated the file structure in @ktbolt's branch using Since we can't do a squash and merge in this pull request, I already squashed @ktbolt's 21 commits into one using an interactive rebase (marking all but the first commit as
Finally, I applied @ktbolt's changes by creating a diff to the rebased branch with |
Note that there are still many files shown as newly created. However, this is just a If you do a |
@ktbolt, @menon-karthik I'll fix the Doxygen documentation. It doesn't find the files anymore and many comments need to be updated. |
Done! There are a few more Doxygen warnings, see #46, but nothing that should prevent this from being merged. |
38b9afd
to
c0b61f9
Compare
c0b61f9
to
6b716fd
Compare
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.
|
||
# Need to add the -fPIC flag to build the interface shared library. | ||
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") | ||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") |
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.
@ktbolt Just wondering why this wasn't required previously?
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.
@menon-karthik The current version creates object files that are linked into the interface shared libraries so they need to have relative addresses.
|
||
#include "Node.h" | ||
|
||
namespace zd_model { |
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.
@ktbolt Do we really need to call this zd_model
instead of just model
?
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.
@menon-karthik Oops, meant to rename that, was testing for name collision problems. I plan on removing namespaces in a later Issue.
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.
Git thinks many of these files are copied from src/io/namespace
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.
Just pointing this out, not saying it's something we should dig into.
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.
Yeah, that's weird. But I think it's just GitHub's diff display. In the history, it shows up correctly.
@mrp089 Thank you for getting all of this to work, my partner in crime! |
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.
Looks good!
Thanks a bunch @mrp089 and @menon-karthik for pushing this messy PR through.
This is equivalent to #41 but leaves the file history intact. Closes #36.
Do not squash and merge to leave history intact.