Skip to content
Snippets Groups Projects

minor changes to allow compiling with clang

Closed MichelJuillard requested to merge MichelJuillard/preprocessor:master into master
2 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
1014 {
1015 cerr << "ERROR: the model equation defining the 'target' of 'pac_target_info(" << name << ")' contains a variable (" << symbol_table.getName(var) << ") that is not declared as a 'component'" << endl;
1016 exit(EXIT_FAILURE);
1017 }
1009 {
1010 auto tmp = dynamic_model.AddVariable(var);
1011 if (auto it = find_if(components.begin(), components.end(),
1012 [& tmp = tmp](const auto &v) { return get<0>(v) == tmp; });
1013 it != components.end())
1014 get<4>(*it) = coeff;
1015 else
1016 {
1017 cerr << "ERROR: the model equation defining the 'target' of 'pac_target_info(" << name << ")' contains a variable (" << symbol_table.getName(var) << ") that is not declared as a 'component'" << endl;
1018 exit(EXIT_FAILURE);
1019 }
1020 }
  • 20 20 #ifndef _EQUATION_TAGS_HH
    21 21 #define _EQUATION_TAGS_HH
    22 22
    23 using namespace std;
    24
    23 #include <iostream>
  • I’ve pushed several commits that should fix your problems (ebf7b6c5 and 8c528f4f).

    I’ve also pushed fixes for several clang warnings (5572e478, 75a26b6d, 0db05a88).

    Please let me know if they suit your needs, and I’ll close this MR.

  • Thanks @sebastien. I will test

  • The code compiles now without problem for macOs and FreeBsd, the two platforms for which Julia uses clang. You can close the issue

  • Sébastien Villemot mentioned in merge request !58 (closed)

    mentioned in merge request !58 (closed)

  • Please register or sign in to reply
    Loading