API tools faq
paste
Advertisement
Guest User

Fomus 0.1.18-alpha+Boost 1.72 build patches

a guest
Jul 19th, 2020
185
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 13.88 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/src/lib/api.cc b/src/lib/api.cc
  2. index 62ec8d2..1a0edb8 100644
  3. --- a/src/lib/api.cc
  4. +++ b/src/lib/api.cc
  5. @@ -1685,3 +1685,3 @@ void fomus_run(FOMUS f) {
  6.       if (i == mods.end()) {
  7. -       i = find_if(mods.begin(), mods.end(), bind(&modbase::modout_hasext, boost::lambda::_1, boost::lambda::constant_ref(boost::to_lower_copy(ii))));
  8. +       i = find_if(mods.begin(), mods.end(), bind(&modbase::modout_hasext, std::placeholders::_1, boost::to_lower_copy(ii)));
  9.         if (i == mods.end()) {
  10. diff --git a/src/lib/data.cc b/src/lib/data.cc
  11. index b2161e1..04dc941 100644
  12. --- a/src/lib/data.cc
  13. +++ b/src/lib/data.cc
  14. @@ -346,3 +346,4 @@ namespace fomus {
  15.      NODEAL:
  16. -      out << std::fixed << std::setprecision(3) << val;
  17. +      out.setf(std::ios_base::fixed, std::ios_base::floatfield);
  18. +      out << std::setprecision(3) << val;
  19.      }
  20. diff --git a/src/lib/heads.h b/src/lib/heads.h
  21. index 3a3d513..d7eacd8 100644
  22. --- a/src/lib/heads.h
  23. +++ b/src/lib/heads.h
  24. @@ -89,3 +89,3 @@
  25.  
  26. -#include <boost/math/common_factor.hpp>
  27. +#include <boost/integer/common_factor.hpp>
  28.  
  29. diff --git a/src/lib/instrs.cc b/src/lib/instrs.cc
  30. index 66c6989..c4cddf2 100644
  31. --- a/src/lib/instrs.cc
  32. +++ b/src/lib/instrs.cc
  33. @@ -85,3 +85,3 @@ namespace fomus {
  34.        s << stringify(sets.begin()->second->getname(), ":=,") << ' ' << sets.begin()->second->getvalstr(fd, ")>,"); // : el.begin()->first) << ' ' << el.begin()->second;
  35. -      for (setmap_constit i(next(sets.begin())); i != sets.end(); ++i) {
  36. +      for (setmap_constit i(std::next(sets.begin())); i != sets.end(); ++i) {
  37.     s << ", " << stringify(i->second->getname(), ":=,") << ' ' << i->second->getvalstr(fd, ")>,");
  38. diff --git a/src/lib/mod/octs/octs.cc b/src/lib/mod/octs/octs.cc
  39. index ab47145..6aa9af0 100644
  40. --- a/src/lib/mod/octs/octs.cc
  41. +++ b/src/lib/mod/octs/octs.cc
  42. @@ -124,7 +124,7 @@ namespace octs {
  43.     fomus_float mx = 0, ll = 0;
  44. -   for (std::vector<scorenode>::const_iterator i(arr.begin()), ie(boost::prior(arr.end())); i != arr.end(); ++i) {
  45. +   for (std::vector<scorenode>::const_iterator i(arr.begin()), ie(std::prev(arr.end())); i != arr.end(); ++i) {
  46.       assert(i->dist > 0);
  47.       ll += i->dist;
  48. -     assert(octchange(i, (i == ie ? n2 : *boost::next(i)->node), n2) >= 0);
  49. -     mx += octchange(i, (i == ie ? n2 : *boost::next(i)->node), n2) * i->dist;
  50. +     assert(octchange(i, (i == ie ? n2 : *std::next(i)->node), n2) >= 0);
  51. +     mx += octchange(i, (i == ie ? n2 : *std::next(i)->node), n2) * i->dist;
  52.     }
  53. diff --git a/src/lib/mod/quant/grtquant.cc b/src/lib/mod/quant/grtquant.cc
  54. index 67aeb66..b3a0d51 100644
  55. --- a/src/lib/mod/quant/grtquant.cc
  56. +++ b/src/lib/mod/quant/grtquant.cc
  57. @@ -107,3 +107,3 @@ namespace grtquant {
  58.      assert(!vect.empty());
  59. -    for (std::vector<holder>::iterator c(be), i(boost::next(be)); i < en; ++i) { // loop through all, group into chords & set to same durs
  60. +    for (std::vector<holder>::iterator c(be), i(std::next(be)); i < en; ++i) { // loop through all, group into chords & set to same durs
  61.        if (c->o1 == i->o1) { // same offset
  62. @@ -119,3 +119,3 @@ namespace grtquant {
  63.        fomus_rat cur = {0, 1};
  64. -      for (std::vector<holder>::iterator i(mi), l(boost::prior(en)); ; ++i) { // 0 and after
  65. +      for (std::vector<holder>::iterator i(mi), l(std::prev(en)); ; ++i) { // 0 and after
  66.     module_value o1(i->o1), o2(i->o2); 
  67. @@ -123,3 +123,3 @@ namespace grtquant {
  68.     if (i >= l) break;
  69. -   if (!isolap(*boost::next(i), o1, o2, i->dur)) {cur = cur + i->dur;}
  70. +   if (!isolap(*std::next(i), o1, o2, i->dur)) {cur = cur + i->dur;}
  71.        }
  72. @@ -128,3 +128,3 @@ namespace grtquant {
  73.        fomus_rat cur = {0, 1};
  74. -      for (std::vector<holder>::iterator i(boost::prior(mi)); ; --i) { // before 0
  75. +      for (std::vector<holder>::iterator i(std::prev(mi)); ; --i) { // before 0
  76.     module_value o1(i->o1), o2(i->o2); 
  77. @@ -132,3 +132,3 @@ namespace grtquant {
  78.     if (i == be) break;
  79. -   if (!isolap(*boost::prior(i), o1, o2, i->dur)) {cur = cur - i->dur;}
  80. +   if (!isolap(*std::prev(i), o1, o2, i->dur)) {cur = cur - i->dur;}
  81.        }
  82. diff --git a/src/lib/mods.h b/src/lib/mods.h
  83. index 6597965..fcbb7df 100644
  84. --- a/src/lib/mods.h
  85. +++ b/src/lib/mods.h
  86. @@ -216,3 +216,3 @@ namespace fomus {
  87.      dlmodt2(const T& st):dlmodt1<T>(st) {}
  88. -    void* getdata(FOMUS f) const {return initerrwrap(T::newdata(f));}
  89. +    void* getdata(FOMUS f) const {return this->initerrwrap(T::newdata(f));}
  90.      void freedata(void* data) const {T::freedata(data); T::initerrcheck();}     
  91. diff --git a/src/lib/moremath.h b/src/lib/moremath.h
  92. index afc2c32..4178f7e 100644
  93. --- a/src/lib/moremath.h
  94. +++ b/src/lib/moremath.h
  95. @@ -37,3 +37,3 @@ namespace fomus {
  96.    inline rat ratmod(const rat& x, const rat& y) {
  97. -    fint m = boost::math::lcm(x.denominator(), y.denominator());
  98. +    fint m = boost::integer::lcm(x.denominator(), y.denominator());
  99.      return rat(mod(x.numerator() * (m / x.denominator()), y.numerator() * (m / y.denominator())), m);
  100. diff --git a/src/lib/numbers.h b/src/lib/numbers.h
  101. index 3d7cc1f..b77a224 100644
  102. --- a/src/lib/numbers.h
  103. +++ b/src/lib/numbers.h
  104. @@ -202,3 +202,6 @@ namespace FNAMESPACE {
  105.     std::ostringstream ss;
  106. -   ss << std::fixed << std::setprecision(5) << std::showpoint << x.val.f;
  107. +    ss.setf(std::ios_base::fixed, std::ios_base::floatfield);
  108. +    ss << std::setprecision(5);
  109. +    ss.setf(std::ios_base::showpoint);
  110. +    ss << x.val.f;
  111.     std::string s(boost::trim_right_copy_if(ss.str(), boost::lambda::_1 == '0'));
  112. diff --git a/src/lib/util.cc b/src/lib/util.cc
  113. index 6b7dd06..e5c8f51 100644
  114. --- a/src/lib/util.cc
  115. +++ b/src/lib/util.cc
  116. @@ -114,3 +114,3 @@ fomus_rat mod_rat(fomus_rat x, fomus_rat y) {
  117.    ENTER_API;
  118. -  fomus_int m = boost::math::lcm(x.den, y.den);
  119. +  fomus_int m = boost::integer::lcm(x.den, y.den);
  120.    return fomus::tofrat(fomus::rat(mod(x.num * (m / x.den), y.num * (m / y.den)), m));
  121. diff --git a/src/lib/vars.cc b/src/lib/vars.cc
  122. index 7147cee..c98e5f7 100644
  123. --- a/src/lib/vars.cc
  124. +++ b/src/lib/vars.cc
  125. @@ -99,3 +99,3 @@ namespace fomus {
  126.        map.begin()->second->print(o, fd, false);
  127. -      for (globpercsvarvect_constit i(next(map.begin())); i != map.end(); ++i) {
  128. +      for (globpercsvarvect_constit i(std::next(map.begin())); i != map.end(); ++i) {
  129.     o << ' ';
  130. @@ -132,3 +132,3 @@ namespace fomus {
  131.        map.begin()->second->print(o, fd, false);
  132. -      for (globinstsvarvect_constit i(next(map.begin())); i != map.end(); ++i) {
  133. +      for (globinstsvarvect_constit i(std::next(map.begin())); i != map.end(); ++i) {
  134.     o << ' ';
  135. @@ -324,3 +324,3 @@ namespace fomus {
  136.        redosig(*i->second, *x, fd ? fd->getnotepr() : note_print, fd ? fd->getaccpr() : acc_print, fd ? fd->getmicpr() : mic_print, fd ? fd->getoctpr() : oct_print);
  137. -      el.insert(listelmap::value_type(i->first, x.release()));
  138. +      el.insert(listelmap::value_type(i->first, listelshptr(x.release())));
  139.      }
  140. @@ -365,3 +365,3 @@ namespace fomus {
  141.        listelvect* x;
  142. -      el.insert(listelmap::value_type(i->first, x = new listelvect));
  143. +      el.insert(listelmap::value_type(i->first, listelshptr(x = new listelvect)));
  144.        redosig(*i->second, *x, ta.notepr, ta.accpr, ta.micpr, ta.octpr);
  145. @@ -375,46 +375,46 @@ namespace fomus {
  146.      listelvect v;
  147. -    el.insert(listelmap::value_type("cmaj", new listelvect(v)));
  148. -    el.insert(listelmap::value_type("amin",  new listelvect(v)));
  149. +    el.insert(listelmap::value_type("cmaj", listelshptr(new listelvect(v))));
  150. +    el.insert(listelmap::value_type("amin",  listelshptr(new listelvect(v))));
  151.      v.push_back("f+");
  152. -    el.insert(listelmap::value_type("gmaj", new listelvect(v)));
  153. -    el.insert(listelmap::value_type("emin", new listelvect(v)));
  154. +    el.insert(listelmap::value_type("gmaj", listelshptr(new listelvect(v))));
  155. +    el.insert(listelmap::value_type("emin", listelshptr(new listelvect(v))));
  156.      v.push_back("c+");
  157. -    el.insert(listelmap::value_type("dmaj", new listelvect(v)));
  158. -    el.insert(listelmap::value_type("bmin", new listelvect(v)));
  159. +    el.insert(listelmap::value_type("dmaj", listelshptr(new listelvect(v))));
  160. +    el.insert(listelmap::value_type("bmin", listelshptr(new listelvect(v))));
  161.      v.push_back("g+");    
  162. -    el.insert(listelmap::value_type("amaj", new listelvect(v)));
  163. -    el.insert(listelmap::value_type("f+min", new listelvect(v)));
  164. +    el.insert(listelmap::value_type("amaj", listelshptr(new listelvect(v))));
  165. +    el.insert(listelmap::value_type("f+min", listelshptr(new listelvect(v))));
  166.      v.push_back("d+");        
  167. -    el.insert(listelmap::value_type("emaj", new listelvect(v)));
  168. -    el.insert(listelmap::value_type("c+min", new listelvect(v)));
  169. +    el.insert(listelmap::value_type("emaj", listelshptr(new listelvect(v))));
  170. +    el.insert(listelmap::value_type("c+min", listelshptr(new listelvect(v))));
  171.      v.push_back("a+");            
  172. -    el.insert(listelmap::value_type("bmaj", new listelvect(v)));
  173. -    el.insert(listelmap::value_type("g+min", new listelvect(v)));
  174. +    el.insert(listelmap::value_type("bmaj", listelshptr(new listelvect(v))));
  175. +    el.insert(listelmap::value_type("g+min", listelshptr(new listelvect(v))));
  176.      v.push_back("e+");                
  177. -    el.insert(listelmap::value_type("f+maj", new listelvect(v)));
  178. -    el.insert(listelmap::value_type("d+min", new listelvect(v)));
  179. +    el.insert(listelmap::value_type("f+maj", listelshptr(new listelvect(v))));
  180. +    el.insert(listelmap::value_type("d+min", listelshptr(new listelvect(v))));
  181.      v.push_back("b+");                
  182. -    el.insert(listelmap::value_type("c+maj", new listelvect(v)));
  183. -    el.insert(listelmap::value_type("a+min", new listelvect(v)));
  184. +    el.insert(listelmap::value_type("c+maj", listelshptr(new listelvect(v))));
  185. +    el.insert(listelmap::value_type("a+min", listelshptr(new listelvect(v))));
  186.      v.clear(); v.push_back("b-");                
  187. -    el.insert(listelmap::value_type("fmaj", new listelvect(v)));
  188. -    el.insert(listelmap::value_type("dmin", new listelvect(v)));
  189. +    el.insert(listelmap::value_type("fmaj", listelshptr(new listelvect(v))));
  190. +    el.insert(listelmap::value_type("dmin", listelshptr(new listelvect(v))));
  191.      v.push_back("e-");
  192. -    el.insert(listelmap::value_type("b-maj", new listelvect(v)));
  193. -    el.insert(listelmap::value_type("gmin", new listelvect(v)));
  194. +    el.insert(listelmap::value_type("b-maj", listelshptr(new listelvect(v))));
  195. +    el.insert(listelmap::value_type("gmin", listelshptr(new listelvect(v))));
  196.      v.push_back("a-");    
  197. -    el.insert(listelmap::value_type("e-maj", new listelvect(v)));
  198. -    el.insert(listelmap::value_type("cmin", new listelvect(v)));
  199. +    el.insert(listelmap::value_type("e-maj", listelshptr(new listelvect(v))));
  200. +    el.insert(listelmap::value_type("cmin", listelshptr(new listelvect(v))));
  201.      v.push_back("d-");        
  202. -    el.insert(listelmap::value_type("a-maj", new listelvect(v)));
  203. -    el.insert(listelmap::value_type("fmin", new listelvect(v)));
  204. +    el.insert(listelmap::value_type("a-maj", listelshptr(new listelvect(v))));
  205. +    el.insert(listelmap::value_type("fmin", listelshptr(new listelvect(v))));
  206.      v.push_back("g-");            
  207. -    el.insert(listelmap::value_type("d-maj", new listelvect(v)));
  208. -    el.insert(listelmap::value_type("b-min", new listelvect(v)));
  209. +    el.insert(listelmap::value_type("d-maj", listelshptr(new listelvect(v))));
  210. +    el.insert(listelmap::value_type("b-min", listelshptr(new listelvect(v))));
  211.      v.push_back("c-");                
  212. -    el.insert(listelmap::value_type("g-maj", new listelvect(v)));
  213. -    el.insert(listelmap::value_type("e-min", new listelvect(v)));
  214. +    el.insert(listelmap::value_type("g-maj", listelshptr(new listelvect(v))));
  215. +    el.insert(listelmap::value_type("e-min", listelshptr(new listelvect(v))));
  216.      v.push_back("f-");                    
  217. -    el.insert(listelmap::value_type("c-maj", new listelvect(v)));
  218. -    el.insert(listelmap::value_type("a-min", new listelvect(v)));
  219. +    el.insert(listelmap::value_type("c-maj", listelshptr(new listelvect(v))));
  220. +    el.insert(listelmap::value_type("a-min", listelshptr(new listelvect(v))));
  221.      assert(getid() == KEYSIG_ID); initmodval();
  222. @@ -460,8 +460,8 @@ namespace fomus {
  223.        rat a(acv.isnull() ? std::numeric_limits<fint>::min() + 1 : numtorat(acv));
  224. -      rat i(miv.isnull() ? std::numeric_limits<fint>::min() + 1 : numtorat(miv));
  225. +      rat i2(miv.isnull() ? std::numeric_limits<fint>::min() + 1 : numtorat(miv));
  226.        rat o(ocv.isnull() ? std::numeric_limits<fint>::min() + 1 : numtorat(ocv));
  227. -      user.push_back(new userkeysigent(m, a, i, o));
  228. +      user.push_back(new userkeysigent(m, a, i2, o));
  229.        if (m.numerator() == std::numeric_limits<fint>::min() + 1) return false;
  230.        if (a.numerator() == std::numeric_limits<fint>::min() + 1) a = 0; // must have at least these two things
  231. -      if (i.numerator() == std::numeric_limits<fint>::min() + 1) i = 0; // must have at least these two things
  232. +      if (i2.numerator() == std::numeric_limits<fint>::min() + 1) i2 = 0; // must have at least these two things
  233.        if (o.numerator() != std::numeric_limits<fint>::min() + 1) { // got an octave
  234. @@ -470,6 +470,6 @@ namespace fomus {
  235.     assert(todiatonic(x0.numerator()) >= 0 && todiatonic(x0.numerator()) < 75);
  236. -   sig[todiatonic(x0.numerator())] = std::pair<rat, rat>(a, i);
  237. +   sig[todiatonic(x0.numerator())] = std::pair<rat, rat>(a, i2);
  238.        } else {
  239.     if (m.denominator() != 1 || isblack(m.numerator())) continue; // better to skip it
  240. -   for (int x = todiatonic(m.numerator()) % 7; x < 75; x += 7) sig[x] = std::pair<rat, rat>(a, i);
  241. +   for (int x = todiatonic(m.numerator()) % 7; x < 75; x += 7) sig[x] = std::pair<rat, rat>(a, i2);
  242.        }
  243. diff --git a/src/lib/vars.h b/src/lib/vars.h
  244. index 31938f9..64beba4 100644
  245. --- a/src/lib/vars.h
  246. +++ b/src/lib/vars.h
  247. @@ -458,3 +458,4 @@ namespace fomus {
  248.        std::ostringstream s;
  249. -      s << std::fixed << std::setprecision(3) << val;
  250. +      s.setf(std::ios_base::fixed, std::ios_base::floatfield);
  251. +      s << std::setprecision(3) << val;
  252.        return s.str();
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!