Skip to content

Conversation

@johnlaing
Copy link
Contributor

Addresses #408

Copy link
Member

@eddelbuettel eddelbuettel left a comment

Choose a reason for hiding this comment

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

Had not thought of that approach either. If that works locally thumbs up!

@eddelbuettel
Copy link
Member

Looks good.

I would vote for squash merge and rebase into #404 and can help if needed.

@johnlaing
Copy link
Contributor Author

It works:

jlaing@penguin:~/dev/Rblpapi$ Rscript -e 'Rcpp::compileAttributes()'
jlaing@penguin:~/dev/Rblpapi$ git status
On branch bugfix/duplicate_exports
Your branch is up to date with 'origin/bugfix/duplicate_exports'.

nothing to commit, working tree clean

Doing the same on master would produce different exports files.

Happy to let you execute squash/merge/rebase/whatever

@eddelbuettel
Copy link
Member

eddelbuettel commented Mar 12, 2025

Yes my 'Looks good' was based on quick checkout of the branch, installing, re-compiling attributes and re-installing.

I'll add a quick ChangeLog for you and then proceed. Ok?

@eddelbuettel eddelbuettel merged commit f03d783 into master Mar 12, 2025
4 checks passed
@eddelbuettel
Copy link
Member

Ok -- #404 is now on top of the updated master and the same two commits ahead with the actual change by @klin333 as well as my conditional build (including your removal of the export tag in the one altered file / half).

Should be good. And I had forgotten that I had described what I may try next already in #407

@eddelbuettel eddelbuettel deleted the bugfix/duplicate_exports branch March 29, 2025 20:35
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