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

fix compilation from swift wrapping #1309

Merged
merged 4 commits into from
Mar 1, 2018
Merged

Conversation

kerautret
Copy link
Member

PR Description

Small fix which appears by using DGtal in swift based application.

Checklist

  • Unit-test of your feature with Catch.
  • Doxygen documentation of the code completed (classes, methods, types, members...)
  • Documentation module page added or updated.
  • New entry in the ChangeLog.md added.
  • No warning raised in Debug cmake mode (otherwise, Travis C.I. will fail).
  • All continuous integration tests pass (Travis & appveyor)

@@ -259,7 +259,7 @@ DGtal::Trace::progressBar(const double currentValue, const double maximumValue)
}
// and back to line begin - do not forget the fflush to avoid output buffering problems!

BOOST_STATIC_CONSTANT(std::string, rotation_string = "|\\-/");
std::string rotation_string = "|\\-/";
Copy link
Member

Choose a reason for hiding this comment

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

const std::string ... ?

(I agree that the static stuff is not necessary)

Copy link
Member Author

Choose a reason for hiding this comment

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

yes ;)

@dcoeurjo
Copy link
Member

could you please merge the master ?

@dcoeurjo
Copy link
Member

(+ changelog?)

@kerautret
Copy link
Member Author

done ;)

@dcoeurjo
Copy link
Member

dcoeurjo commented Mar 1, 2018

thanks merging

@dcoeurjo dcoeurjo merged commit dbaf82f into DGtal-team:master Mar 1, 2018
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.

2 participants