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

Include bimap #24

Merged
merged 1 commit into from Feb 22, 2016
Merged

Include bimap #24

merged 1 commit into from Feb 22, 2016

Conversation

@jimhester
Copy link
Contributor

@jimhester jimhester commented Feb 20, 2016

Previously only a subset of the bimap functionality was included, presumably because it was needed by other included components. Notably most of the bimap container adapters were absent, so you could not use anything but basic bimaps.

I basically downloaded boost_1_60_0.tar.gz and ran local/scripts/CreateBoost.sh with bimap added in boostextras and an updated date. If there is anything else needed please let me know.

@eddelbuettel
Copy link
Owner

@eddelbuettel eddelbuettel commented Feb 20, 2016

I believe you. Can you edit the diff set to show just the relevant bit in the actual script(s) governing this? The resulting diff is too large be navigated efficiently (while I am traveling/in a rush).

@jimhester
Copy link
Contributor Author

@jimhester jimhester commented Feb 22, 2016

Here is the diff for just local/scripts/CreateBoost.sh

No rush on this so if it is not convenient to review now it can wait.

ommit 14d9b5a06c583d2c0863b93218cd3baed73a7b28
Author: Jim Hester <james.f.hester@gmail.com>
Date:   Sat Feb 20 14:26:43 2016 -0500

    Include bimap headers

diff --git a/local/scripts/CreateBoost.sh b/local/scripts/CreateBoost.sh
index 1172699..cd682d0 100755
--- a/local/scripts/CreateBoost.sh
+++ b/local/scripts/CreateBoost.sh
@@ -13,7 +13,7 @@ pkgdir="${HOME}/git/bh"
 boosttargz="boost_1_60_0.tar.gz"
 ## -- current package version and date (and other metadata as needed)
 version="1.60.0-0"
-date="2015-12-24"
+date="2016-2-20"



@@ -121,7 +121,7 @@ bcp --boost=${boostroot}  ${boostlibs}  ${pkgincl}   > /dev/null  2>&1
 # Plus phoenix (cf [github] issue ticket #19)
 boostextras="filesystem spirit foreach algorithm iostreams \
             dynamic_bitset heap any circular_buffer geometry fusion graph \
-            multiprcecision phoenix"
+            multiprcecision phoenix bimap"

 bcp --boost=${boostroot}  ${boostextras}   ${pkgincl}   > /dev/null   2>&1
@eddelbuettel
Copy link
Owner

@eddelbuettel eddelbuettel commented Feb 22, 2016

Looks perfect. I'll trust you and just apply this.

eddelbuettel added a commit that referenced this pull request Feb 22, 2016
Include bimap
@eddelbuettel eddelbuettel merged commit 0b3c2a6 into eddelbuettel:master Feb 22, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
eddelbuettel added a commit that referenced this pull request Feb 22, 2016
eddelbuettel added a commit that referenced this pull request Feb 25, 2016
Include bimap

Former-commit-id: 0b3c2a6
eddelbuettel added a commit that referenced this pull request Feb 25, 2016
Former-commit-id: 4092d17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.