From 4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 12 Sep 2005 12:46:49 +0000 Subject: [PATCH] * lily/tie-column.cc (set_manual_tie_configuration): new function. * lily/laissez-vibrer-tie.cc: new file. * lily/tie-column.cc (set_tie_config_directions): new function (final_shape_adjustment): new function. (shift_small_ties): new function. * lily/tie-column.cc (set_chord_outline): new function. --- ChangeLog | 20 ++++++++++++ Documentation/topdocs/NEWS.tely | 10 +++--- VERSION | 2 +- flower/file-cookie.cc | 3 +- flower/file-name.cc | 1 + flower/file-path.cc | 1 + flower/getopt-long.cc | 1 + flower/include/array.hh | 3 +- flower/include/array.icc | 3 +- flower/include/axis.hh | 1 + flower/include/compare.hh | 8 +++-- flower/include/cons.hh | 1 + flower/include/cpu-timer.hh | 1 + flower/include/file-cookie.hh | 5 ++- flower/include/flower-proto.hh | 7 ++--- flower/include/getopt-long.hh | 1 + flower/include/interval.tcc | 1 + flower/include/libc-extension.hh | 27 ++++++++++------- flower/include/memory-stream.hh | 3 +- flower/include/parse-afm.hh | 1 + flower/include/real.hh | 22 ++++++++------ flower/include/string-convert.hh | 1 + flower/include/string-data.icc | 3 +- flower/include/string-handle.icc | 4 +-- flower/include/string.hh | 3 +- flower/include/virtual-methods.hh | 3 +- flower/libc-extension.cc | 42 ++++++++++++++------------ flower/memory-stream.cc | 7 +++-- flower/offset.cc | 3 +- flower/parse-afm.cc | 1 + flower/polynomial.cc | 42 ++++++++++++++------------ flower/rational.cc | 1 + flower/real.cc | 1 + flower/rtti.cc | 3 +- flower/string-convert.cc | 1 + flower/string.cc | 6 ++-- flower/stringutil.cc | 4 ++- flower/warn.cc | 1 + lily/accidental-engraver.cc | 3 +- lily/accidental-placement.cc | 3 +- lily/afm.cc | 3 +- lily/align-interface.cc | 5 +-- lily/bar-line.cc | 3 +- lily/beam-concave.cc | 3 +- lily/beam-quanting.cc | 6 ++-- lily/beam.cc | 39 +++++++++++++++++------- lily/bezier-bow.cc | 6 ++-- lily/bezier.cc | 3 +- lily/binary-source-file.cc | 1 + lily/book.cc | 1 + lily/break-align-interface.cc | 3 +- lily/break-substitution.cc | 1 + lily/clef-engraver.cc | 1 + lily/cluster.cc | 1 + lily/completion-note-heads-engraver.cc | 1 + lily/custos.cc | 3 +- lily/dimension-cache.cc | 3 +- lily/dot-column.cc | 5 +-- lily/drum-note-engraver.cc | 1 + lily/easy-notation.cc | 4 ++- lily/file-name-map.cc | 3 +- lily/font-metric.cc | 3 +- lily/font-select.cc | 3 +- lily/function-documentation.cc | 1 + lily/general-scheme.cc | 7 +++-- lily/global-context.cc | 1 + lily/gourlay-breaking.cc | 3 +- lily/grob-property.cc | 3 +- lily/grob.cc | 3 +- lily/includable-lexer.cc | 1 + lily/include/afm.hh | 3 +- lily/include/context.hh | 5 +-- lily/include/includable-lexer.hh | 1 - lily/include/midi-stream.hh | 1 + lily/include/misc.hh | 1 + lily/include/moment.hh | 2 +- lily/include/object-key-dumper.hh | 7 +++-- lily/include/object-key-undumper.hh | 4 ++- lily/include/open-type-font.hh | 4 ++- lily/include/source-file.hh | 5 +-- lily/include/stencil.hh | 1 + lily/include/stream.hh | 9 +++--- lily/include/tweak-registration.hh | 3 +- lily/input.cc | 1 + lily/keyword.cc | 1 + lily/least-squares.cc | 2 +- lily/ledger-line-spanner.cc | 3 +- lily/lexer.ll | 40 +++++++++++++++++++++--- lily/lily-guile.cc | 1 + lily/lily-lexer.cc | 1 + lily/line-spanner.cc | 3 +- lily/lookup.cc | 3 +- lily/lyric-extender.cc | 3 +- lily/lyric-hyphen.cc | 3 +- lily/main.cc | 4 ++- lily/mark-engraver.cc | 1 + lily/mensural-ligature.cc | 3 +- lily/metronome-engraver.cc | 1 + lily/midi-def.cc | 3 +- lily/midi-stream.cc | 3 +- lily/misc.cc | 3 +- lily/modified-font-metric.cc | 1 + lily/moment.cc | 4 +-- lily/music-iterator.cc | 1 + lily/note-collision.cc | 3 +- lily/note-column.cc | 3 +- lily/note-head.cc | 3 +- lily/note-heads-engraver.cc | 1 + lily/open-type-font.cc | 4 ++- lily/pango-select.cc | 3 +- lily/paper-outputter.cc | 3 +- lily/parse-scm.cc | 1 + lily/parser.yy | 8 ++--- lily/percent-repeat-item.cc | 3 +- lily/performance.cc | 1 + lily/pfb.cc | 1 + lily/program-option.cc | 3 +- lily/rest-collision.cc | 3 +- lily/scm-hash.cc | 7 ++--- lily/score.cc | 1 + lily/side-position-interface.cc | 5 ++- lily/simple-spacer-scheme.cc | 3 +- lily/simple-spacer.cc | 3 +- lily/slur-configuration.cc | 3 +- lily/slur-scoring.cc | 6 ++-- lily/slur.cc | 3 +- lily/source-file.cc | 11 ++++--- lily/spaceable-grob.cc | 3 +- lily/spacing-spanner.cc | 3 +- lily/spanner.cc | 3 +- lily/staff-spacing.cc | 4 +-- lily/staff-symbol-referencer.cc | 3 +- lily/stem.cc | 6 ++-- lily/stencil-scheme.cc | 3 +- lily/stencil.cc | 3 +- lily/system-start-delimiter.cc | 3 +- lily/system.cc | 3 +- lily/tab-note-heads-engraver.cc | 1 + lily/text-interface.cc | 3 +- lily/tie-column.cc | 7 +++-- lily/tie-helper.cc | 3 +- lily/tie.cc | 3 +- lily/tuplet-bracket.cc | 3 +- lily/vaticana-ligature.cc | 3 +- lily/volta-bracket.cc | 1 + python/midi.c | 2 +- stepmake/stepmake/c++-vars.make | 3 ++ 147 files changed, 433 insertions(+), 218 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad9d55db97..50086508d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,26 @@ 2005-09-08 Jan Nieuwenhuizen + * Documentation/user/lilypond.tely: Spell Baßtuba in UTF-8 (Werner). + + * lily, flower: Include C++ iso C headers. Import namespace std + throughout. + + * lily/side-position-interface.cc: + * lily/scm-hash.cc: + * lily/note-head.cc: + * lily/include/includable-lexer.hh: + * flower/include/string-data.icc: Remove using std::*. + + * lily, flower: Include C++ iso C headers. Import namespace std + throughout. + + * lily/side-position-interface.cc: + * lily/scm-hash.cc: + * lily/note-head.cc: + * lily/include/includable-lexer.hh: + * flower/include/string-data.icc: Remove using std::*. + * Documentation/user/instrument-notation.itely (Entering lyrics): Multiple latin-1->utf-8 conversion fix. diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 84d3c63bc8..0d655dda0a 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -1,4 +1,4 @@ -\input texinfo @c -*-texinfo-*- +\input texinfo @c -*- coding: utf-8; mode: texinfo; -*- @setfilename NEWS.info @settitle NEWS @@ -90,7 +90,7 @@ specify tie formatting This improvement has been sponsored by Bertalan Fodor, Jay Hamilton, Kieren MacMillan, Steve Doonan, Trevor Baca, and Vicente Solsona -Dellá. +Dell¡. @item Formatting of isolated, single ties has been improved. Now, ties avoid @@ -106,7 +106,7 @@ staff lines, flags and dots, without compromising their shape. This improvement has been sponsored by Bertalan Fodor, Jay Hamilton, Kieren MacMillan, Steve Doonan, Trevor Baca, and Vicente Solsona -Dellá. +Dell¡. @item @textanchor{repeat-counter} @@ -251,7 +251,9 @@ Nested tuplets are automatically positioned, } @end lilypond -This feature was sponsored by Trevor Baca. +@c This feature was sponsored by Trevor Baca. +@c where does this fail? +This feature was sponsored by Trevor Bača. @item Music expressions can be displayed, in LilyPond notation, using the diff --git a/VERSION b/VERSION index ce8dc973f6..b539d4a30c 100644 --- a/VERSION +++ b/VERSION @@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=7 PATCH_LEVEL=10 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=namespace diff --git a/flower/file-cookie.cc b/flower/file-cookie.cc index c173b087bc..8f4c9c4f85 100644 --- a/flower/file-cookie.cc +++ b/flower/file-cookie.cc @@ -1,6 +1,7 @@ -#include +#include #include +using namespace std; #include "memory-stream.hh" diff --git a/flower/file-name.cc b/flower/file-name.cc index af0cac2c2c..b293078145 100644 --- a/flower/file-name.cc +++ b/flower/file-name.cc @@ -11,6 +11,7 @@ #include #include +using namespace std; #include "config.hh" diff --git a/flower/file-path.cc b/flower/file-path.cc index d15c92caf4..c66909eae3 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -11,6 +11,7 @@ #include #include +using namespace std; #include "config.hh" #if HAVE_SYS_STAT_H diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc index dd74d8aff7..31cab7a22d 100644 --- a/flower/getopt-long.cc +++ b/flower/getopt-long.cc @@ -11,6 +11,7 @@ #include #include +using namespace std; #include "config.hh" #include "string-convert.hh" diff --git a/flower/include/array.hh b/flower/include/array.hh index 938b1c0ce8..4f2c3c3d0f 100644 --- a/flower/include/array.hh +++ b/flower/include/array.hh @@ -3,10 +3,11 @@ Distributed under GNU GPL */ - #ifndef ARRAY_H #define ARRAY_H + #include +using namespace std; #ifndef INLINE #define INLINE inline diff --git a/flower/include/array.icc b/flower/include/array.icc index f5ccafee74..a3b0c1af87 100644 --- a/flower/include/array.icc +++ b/flower/include/array.icc @@ -80,7 +80,8 @@ void Array::OK () const { assert (max_ >= size_ && size_ >= 0); - if (max_) assert (array_); + if (max_) + assert (array_); } template INLINE diff --git a/flower/include/axis.hh b/flower/include/axis.hh index bafd572cb6..f0ffb41870 100644 --- a/flower/include/axis.hh +++ b/flower/include/axis.hh @@ -10,6 +10,7 @@ #define AXES_HH #include +using namespace std; enum Axis { diff --git a/flower/include/compare.hh b/flower/include/compare.hh index a0d7ed98fa..891f040f48 100644 --- a/flower/include/compare.hh +++ b/flower/include/compare.hh @@ -24,10 +24,12 @@ prefix ONE_OPERATOR (type, function, !=) \ prefix ONE_OPERATOR (type, function, <) \ prefix ONE_OPERATOR (type, function, <=) \ + /* namespace std { */ \ prefix inline type max (type t1, type t2) { return (t1 > t2) ? t1 : t2; } \ - prefix inline type min (type t1, type t2) { return (t1 < t2) ? t1 : t2; } \ - \ - prefix bool operator < (type t1, type t2) /* stupid fix to allow ; */ + prefix inline type min (type t1, type t2) { return (t1 < t2) ? t1 : t2; } \ + /* } */ \ + /* stupid fix to allow ; */ \ + prefix bool operator < (type t1, type t2) #define INSTANTIATE_COMPARE(type, func) TEMPLATE_INSTANTIATE_COMPARE (type, func,) diff --git a/flower/include/cons.hh b/flower/include/cons.hh index 5f7238173b..cb63fd2e2f 100644 --- a/flower/include/cons.hh +++ b/flower/include/cons.hh @@ -10,6 +10,7 @@ #define CONS_HH #include +using namespace std; template class Cons diff --git a/flower/include/cpu-timer.hh b/flower/include/cpu-timer.hh index 47aae73f04..eb9dc21165 100644 --- a/flower/include/cpu-timer.hh +++ b/flower/include/cpu-timer.hh @@ -10,6 +10,7 @@ #define CPU_TIMER_HH #include +using namespace std; #include "real.hh" diff --git a/flower/include/file-cookie.hh b/flower/include/file-cookie.hh index 3945df90ed..ab163ea3eb 100644 --- a/flower/include/file-cookie.hh +++ b/flower/include/file-cookie.hh @@ -2,9 +2,12 @@ extern "C" { #endif -#include #include +#include +using namespace std; + + #if (! defined (__off64_t) && ! defined (__off64_t_defined)) || ! defined (__cplusplus) #define off64_t unsigned long long #endif diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh index 0b16ff11d3..9b9d6a8b39 100644 --- a/flower/include/flower-proto.hh +++ b/flower/include/flower-proto.hh @@ -5,8 +5,8 @@ (c) 1996--2005 Han-Wen Nienhuys */ -#ifndef FPROTO_HH -#define FPROTO_HH +#ifndef FLOWER_PROTO_HH +#define FLOWER_PROTO_HH char const *flower_version_str0 (); @@ -57,5 +57,4 @@ struct File_storage; struct Mapped_file_storage; struct Simple_file_storage; -#endif // FPROTO_HH - +#endif /* FLOWER_PROTO_HH */ diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh index 92f305dd84..c186ce85bb 100644 --- a/flower/include/getopt-long.hh +++ b/flower/include/getopt-long.hh @@ -2,6 +2,7 @@ #define GETOPT_LONG_HH #include +using namespace std; #include "string.hh" diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc index 3cee682cbc..0ac8de264f 100644 --- a/flower/include/interval.tcc +++ b/flower/include/interval.tcc @@ -11,6 +11,7 @@ #include #include +using namespace std; #include "interval.hh" #include "string.hh" diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh index ff85fef841..abf5a549d1 100644 --- a/flower/include/libc-extension.hh +++ b/flower/include/libc-extension.hh @@ -9,8 +9,9 @@ #ifndef LIBC_EXTENSION_HH #define LIBC_EXTENSION_HH -#include -#include +#include +#include +using namespace std; #include "config.hh" @@ -22,6 +23,18 @@ void *memmem (void const *haystack, int haystack_len, void const *needle, int needle_len); #endif /* HAVE_MEMMEM */ +#if ! HAVE_MEMRCHR +unsigned char *memrchr (unsigned char const *p, int n, char c); +#endif + +#if ! HAVE_MEMREV +unsigned char *memrev (unsigned char *byte, int length_i); +#endif + +double my_round (double); + +/* namespace std { */ + #if ! HAVE_SNPRINTF /* GNU extension. */ int snprintf (char *str, size_t n, char const *format, ...); #endif @@ -36,14 +49,6 @@ int isinf (double x); #endif #endif -#if ! HAVE_MEMRCHR -unsigned char *memrchr (unsigned char const *p, int n, char c); -#endif - -#if ! HAVE_MEMREV -unsigned char *memrev (unsigned char *byte, int length_i); -#endif - -double my_round (double); +/* }; */ #endif /* LIBC_EXTENSION_HH */ diff --git a/flower/include/memory-stream.hh b/flower/include/memory-stream.hh index c082a23972..6d29e091fe 100644 --- a/flower/include/memory-stream.hh +++ b/flower/include/memory-stream.hh @@ -9,8 +9,9 @@ #ifndef MEMORY_STREAM_HH #define MEMORY_STREAM_HH -#include +#include #include +using namespace std; #include "libc-extension.hh" #include "file-cookie.hh" diff --git a/flower/include/parse-afm.hh b/flower/include/parse-afm.hh index 3003339ee9..074e98e8e1 100644 --- a/flower/include/parse-afm.hh +++ b/flower/include/parse-afm.hh @@ -80,6 +80,7 @@ */ #include +using namespace std; #define BOOL int #define FLAGS int diff --git a/flower/include/real.hh b/flower/include/real.hh index f4248f5d2f..598c35199a 100644 --- a/flower/include/real.hh +++ b/flower/include/real.hh @@ -12,19 +12,27 @@ #include #include #include +using namespace std; + typedef double Real; extern const Real infinity_f; -using namespace std; -using std::isnan; -using std::isinf; -using std::fabs; +/* namespace std { */ + template inline T abs (T x) { return x > 0 ? x : -x; } +/* } namespace std */ + +inline Real +distance (Real x, Real y) +{ + return abs (x - y); +} + template inline int sign (T x) { if (x) @@ -37,10 +45,4 @@ template inline T sqr (T x) return x * x; } -inline Real -distance (Real x, Real y) -{ - return abs (x - y); -} - #endif diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh index 8a694742dc..5bc8a7dd56 100644 --- a/flower/include/string-convert.hh +++ b/flower/include/string-convert.hh @@ -7,6 +7,7 @@ #define STRING_CONVERT_HH #include +using namespace std; #include "string.hh" diff --git a/flower/include/string-data.icc b/flower/include/string-data.icc index a87354cac5..fac7bd056e 100644 --- a/flower/include/string-data.icc +++ b/flower/include/string-data.icc @@ -14,8 +14,7 @@ #include #include #include -#include - +#include using namespace std; const int INITIALMAX = 8; diff --git a/flower/include/string-handle.icc b/flower/include/string-handle.icc index edda14efef..7e6342dfb8 100644 --- a/flower/include/string-handle.icc +++ b/flower/include/string-handle.icc @@ -11,8 +11,8 @@ source file of Flower lib #define STRINGHANDLE_INL #include - -#include +#include +using namespace std; #include "string-data.hh" #include "string-handle.hh" diff --git a/flower/include/string.hh b/flower/include/string.hh index 91c3f2082f..ed5773e73c 100644 --- a/flower/include/string.hh +++ b/flower/include/string.hh @@ -17,6 +17,7 @@ class ostream; #endif #endif +using namespace std; #include "arithmetic-operator.hh" #include "string-handle.hh" @@ -174,8 +175,8 @@ String to_string (char const *format, ...); */ #include "international.hh" - #include "compare.hh" + INSTANTIATE_COMPARE (String const &, String::compare); #ifdef STRING_UTILS_INLINED diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh index c7746c84f8..bf460b9d21 100644 --- a/flower/include/virtual-methods.hh +++ b/flower/include/virtual-methods.hh @@ -10,11 +10,12 @@ #define VIRTUAL_METHODS_HH #include +using namespace std; #define classname(class_ptr) demangle_classname (typeid (* (class_ptr))) char const * -demangle_classname (std::type_info const &); +demangle_classname (type_info const &); /* Virtual copy constructor. Make up for C++'s lack of a standard factory or clone () function. Uses a typeof hack. Usage: diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc index 7b9b5d7821..f6268e1849 100644 --- a/flower/libc-extension.cc +++ b/flower/libc-extension.cc @@ -11,6 +11,7 @@ #include #include #include +using namespace std; #include "libc-extension.hh" @@ -36,25 +37,6 @@ strnupr (char *start, int n) return start; } -/* - There are some strange problems with round() on early glibcs. -*/ -double -my_round (double x) -{ - return floor (x -0.5)+ 1.0; -} - -#ifndef isinf -#if !HAVE_ISINF -int -isinf (double x) -{ - return x && (x == x/ 2); -} -#endif -#endif - #if !HAVE_MEMMEM /** locate a substring. #memmem# finds the first occurrence of @@ -132,6 +114,27 @@ memrev (unsigned char *byte, int length) return byte; } +/* + There are some strange problems with round() on early glibcs. +*/ +double +my_round (double x) +{ + return floor (x -0.5)+ 1.0; +} + +/* namespace std { */ + +#ifndef isinf +#if !HAVE_ISINF +int +isinf (double x) +{ + return x && (x == x/ 2); +} +#endif +#endif + #if ! HAVE_SNPRINTF int snprintf (char *str, size_t n, char const *format, ...) @@ -157,3 +160,4 @@ vsnprintf (char *str, size_t n, char const *format, va_list args) } #endif +/* } namespace std */ diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc index 0fcedb7565..129bd8600c 100644 --- a/flower/memory-stream.cc +++ b/flower/memory-stream.cc @@ -6,9 +6,10 @@ (c) 2005 Han-Wen Nienhuys */ -#include -#include -#include +#include +#include +#include +using namespace std; #include "memory-stream.hh" diff --git a/flower/offset.cc b/flower/offset.cc index 39e1e0b6da..a4e7ee90e9 100644 --- a/flower/offset.cc +++ b/flower/offset.cc @@ -81,7 +81,8 @@ Offset::arg () const Real Offset::length () const { - return sqrt (sqr (coordinate_a_[X_AXIS]) + sqr (coordinate_a_[Y_AXIS])); + return sqrt (sqr (coordinate_a_[X_AXIS]) + + sqr (coordinate_a_[Y_AXIS])); } bool diff --git a/flower/parse-afm.cc b/flower/parse-afm.cc index d5147f1d74..b65665738f 100644 --- a/flower/parse-afm.cc +++ b/flower/parse-afm.cc @@ -73,6 +73,7 @@ Morten Welinder September 1999. #include #include #include +using namespace std; #include diff --git a/flower/polynomial.cc b/flower/polynomial.cc index 906c948c9f..82617d3db4 100644 --- a/flower/polynomial.cc +++ b/flower/polynomial.cc @@ -7,6 +7,7 @@ #include "polynomial.hh" #include +using namespace std; /* Een beter milieu begint bij uzelf. Hergebruik! @@ -16,7 +17,7 @@ */ Real -Polynomial::eval (Real x)const +Polynomial::eval (Real x) const { Real p = 0.0; @@ -87,7 +88,7 @@ Polynomial::clean () We only do relative comparisons. Absolute comparisons break down in degenerate cases. */ while (degree () > 0 - && (fabs (coefs_.top ()) < FUDGE *fabs (coefs_.top (1)) + && (fabs (coefs_.top ()) < FUDGE * fabs (coefs_.top (1)) || !coefs_.top ())) coefs_.pop (); } @@ -193,8 +194,7 @@ inline Real cubic_root (Real x) return pow (x, 1.0 / 3.0); else if (x < 0.0) return -pow (-x, 1.0 / 3.0); - else - return 0.0; + return 0.0; } static bool @@ -240,21 +240,25 @@ Polynomial::solve_cubic ()const sol.push (-u); } } - else if (D < 0) { /* Casus irreducibilis: three real solutions */ - Real phi = 1.0 / 3 * acos (-q / sqrt (-cb)); - Real t = 2 * sqrt (-p); - - sol.push (t * cos (phi)); - sol.push (-t * cos (phi + M_PI / 3)); - sol.push (-t * cos (phi - M_PI / 3)); - } - else { /* one real solution */ - Real sqrt_D = sqrt (D); - Real u = cubic_root (sqrt_D - q); - Real v = -cubic_root (sqrt_D + q); - - sol.push (u + v); - } + else if (D < 0) + { + /* Casus irreducibilis: three real solutions */ + Real phi = 1.0 / 3 * acos (-q / sqrt (-cb)); + Real t = 2 * sqrt (-p); + + sol.push (t * cos (phi)); + sol.push (-t * cos (phi + M_PI / 3)); + sol.push (-t * cos (phi - M_PI / 3)); + } + else + { + /* one real solution */ + Real sqrt_D = sqrt (D); + Real u = cubic_root (sqrt_D - q); + Real v = -cubic_root (sqrt_D + q); + + sol.push (u + v); + } /* resubstitute */ Real sub = 1.0 / 3 * A; diff --git a/flower/rational.cc b/flower/rational.cc index 133187ef99..65672f5bcb 100644 --- a/flower/rational.cc +++ b/flower/rational.cc @@ -10,6 +10,7 @@ #include #include +using namespace std; #include "string-convert.hh" #include "libc-extension.hh" diff --git a/flower/real.cc b/flower/real.cc index 7f57b1474b..9d880ac929 100644 --- a/flower/real.cc +++ b/flower/real.cc @@ -1,5 +1,6 @@ #include "real.hh" #include +using namespace std; const Real infinity_f = HUGE_VAL; diff --git a/flower/rtti.cc b/flower/rtti.cc index 0c48f7fe90..39941f8f74 100644 --- a/flower/rtti.cc +++ b/flower/rtti.cc @@ -1,9 +1,10 @@ #include +using namespace std; #include "virtual-methods.hh" char const * -demangle_classname (std::type_info const &t) +demangle_classname (type_info const &t) { char const *s = t.name (); while (isdigit (*s)) diff --git a/flower/string-convert.cc b/flower/string-convert.cc index af4d9931bd..7e771c8e73 100644 --- a/flower/string-convert.cc +++ b/flower/string-convert.cc @@ -8,6 +8,7 @@ #include #include +using namespace std; #include "libc-extension.hh" #include "rational.hh" diff --git a/flower/string.cc b/flower/string.cc index c4c7d49abf..79995a1c76 100644 --- a/flower/string.cc +++ b/flower/string.cc @@ -16,6 +16,7 @@ #include #include +using namespace std; #include "libc-extension.hh" #include "string-convert.hh" @@ -232,8 +233,9 @@ String::index (String searchfor) const { char const *me = strh_.to_str0 (); - char const *p = (char const *) - memmem (me, length (), searchfor.to_str0 (), searchfor.length ()); + char const *p + = (char const *) memmem (me, length (), + searchfor.to_str0 (), searchfor.length ()); if (p) return p - me; diff --git a/flower/stringutil.cc b/flower/stringutil.cc index 0e42eac4e4..8516a27552 100644 --- a/flower/stringutil.cc +++ b/flower/stringutil.cc @@ -31,7 +31,9 @@ #ifdef STRING_DEBUG #include -#include +#include +using namespace std; + void * mymemmove (void *dest, void const *src, size_t n) { diff --git a/flower/warn.cc b/flower/warn.cc index 8ac73541b6..6399aad4b7 100644 --- a/flower/warn.cc +++ b/flower/warn.cc @@ -10,6 +10,7 @@ #include #include +using namespace std; /* Is progress indication at NEWLINE? */ static bool progress_newline = true; diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index d81d9a3c36..4a875fcfe2 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -225,7 +225,8 @@ number_accidentals_from_sig (bool *different, SCM sig, Pitch *pitch, if (alter == prev) num = 0; - else if ((abs (alter) < abs (prev) || prev * alter < 0) && alter != 0) + else if ((abs (alter) < abs (prev) + || prev * alter < 0) && alter != 0) num = 2; *different = (alter != prev); } diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index 5eff0dfc45..d4e6a340f8 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -6,7 +6,8 @@ (c) 2002--2005 Han-Wen Nienhuys */ -#include +#include +using namespace std; #include "accidental-placement.hh" #include "skyline.hh" diff --git a/lily/afm.cc b/lily/afm.cc index e5b463ce5a..95f138090a 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -9,6 +9,7 @@ #include "afm.hh" #include +using namespace std; #include "warn.hh" #include "libc-extension.hh" @@ -75,7 +76,7 @@ Adobe_font_metric::find_char_metric (String nm) const int Adobe_font_metric::name_to_index (String name) const { - std::map::const_iterator ai = name_to_metric_dict_.find (name); + map::const_iterator ai = name_to_metric_dict_.find (name); if (ai == name_to_metric_dict_.end ()) return -1; return (*ai).second; diff --git a/lily/align-interface.cc b/lily/align-interface.cc index adbe9d199c..1b661e8f9e 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -181,10 +181,7 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a) */ dy *= stacking_dir; if (j) - { - dy = min (max (dy, threshold[SMALLER]), - threshold[BIGGER]); - } + dy = min (max (dy, threshold[SMALLER]), threshold[BIGGER]); where_f += stacking_dir * dy; total.unite (dims[j] + where_f); diff --git a/lily/bar-line.cc b/lily/bar-line.cc index a0a9ccdae4..ecc8ac70d6 100644 --- a/lily/bar-line.cc +++ b/lily/bar-line.cc @@ -8,7 +8,8 @@ #include "bar-line.hh" -#include +#include +using namespace std; #include "all-font-metrics.hh" #include "font-interface.hh" diff --git a/lily/beam-concave.cc b/lily/beam-concave.cc index edd95394a5..1866e52f27 100644 --- a/lily/beam-concave.cc +++ b/lily/beam-concave.cc @@ -2,7 +2,8 @@ Determine whether a beam is concave. */ -#include +#include +using namespace std; #include "pointer-group-interface.hh" #include "array.hh" diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index 0ee1a01b41..d8544b9b18 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -10,7 +10,8 @@ #include "beam.hh" #include -#include +#include +using namespace std; #include "warn.hh" #include "staff-symbol-referencer.hh" @@ -401,7 +402,8 @@ Beam::score_slopes_dy (Real yl, Real yr, && sign (dy_damp) != sign (dy)) dem += parameters->DAMPING_DIRECTION_PENALTY; - dem += parameters->MUSICAL_DIRECTION_FACTOR *max (0.0, (fabs (dy) - fabs (dy_mus))); + dem += parameters->MUSICAL_DIRECTION_FACTOR + * max (0.0, (fabs (dy) - fabs (dy_mus))); Real slope_penalty = parameters->IDEAL_SLOPE_FACTOR; diff --git a/lily/beam.cc b/lily/beam.cc index 4ad02de78d..0b3ca786c4 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -24,7 +24,8 @@ - beam_translation is the offset between Y centers of the beam. */ -#include // tanh. +#include // tanh. +using namespace std; #include "beam.hh" #include "interval-set.hh" @@ -780,7 +781,7 @@ set_minimum_dy (Grob *me, Real *dy) Real hang = 1.0 - (thickness - slt) / 2; *dy = sign (*dy) * max (fabs (*dy), - min (min (sit, inter), hang)); + min (min (sit, inter), hang)); } } @@ -1402,12 +1403,28 @@ Beam::get_direction_beam_count (Grob *me, Direction d) ADD_INTERFACE (Beam, "beam-interface", "A beam. \n\n" - "The @code{thickness} property is the weight of beams, and is measured " - "in staffspace", - "knee positioning-done position-callbacks " - "concaveness dir-function quant-score auto-knee-gap gap " - "gap-count chord-tremolo beamed-stem-shorten shorten least-squares-dy " - "details damping inspect-quants flag-width-function " - "neutral-direction positions space-function break-overshoot " - "thickness"); - + "The @code{thickness} property is the weight of beams, " + "measured in staffspace", + "auto-knee-gap " + "beamed-stem-shorten " + "break-overshoot " + "chord-tremolo " + "concaveness " + "damping " + "details " + "dir-function " + "flag-width-function " + "gap " + "gap-count " + "inspect-quants " + "knee " + "least-squares-dy " + "neutral-direction " + "position-callbacks " + "positioning-done " + "positions " + "quant-score " + "shorten " + "space-function " + "thickness " + ); diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc index a86a984107..fcc6df45f4 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -6,7 +6,8 @@ (c) 1998--2005 Jan Nieuwenhuizen */ -#include +#include +using namespace std; #include "misc.hh" #include "bezier.hh" @@ -98,8 +99,7 @@ get_slur_indent_height (Real *indent, Real *height, *height = slur_height (width, h_inf, r_0); Real q = 2 * h_inf / max_fraction; - *indent - = 2 * h_inf - sqr (q) * max_fraction / (width + q); + *indent = 2 * h_inf - sqr (q) * max_fraction / (width + q); } Bezier diff --git a/lily/bezier.cc b/lily/bezier.cc index d6ecd0b313..09bcd54a1a 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -6,7 +6,8 @@ (c) 1998--2005 Jan Nieuwenhuizen */ -#include +#include +using namespace std; #include "bezier.hh" #include "warn.hh" diff --git a/lily/binary-source-file.cc b/lily/binary-source-file.cc index 2c726df90d..180991781d 100644 --- a/lily/binary-source-file.cc +++ b/lily/binary-source-file.cc @@ -7,6 +7,7 @@ */ #include // INT_MAX +using namespace std; #include "binary-source-file.hh" #include "string-convert.hh" diff --git a/lily/book.cc b/lily/book.cc index 0c3106e3fa..96a66ce00c 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -9,6 +9,7 @@ #include "book.hh" #include +using namespace std; #include "lilypond-key.hh" #include "global-context.hh" diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index 211058779a..c06c267001 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -6,7 +6,8 @@ (c) 1997--2005 Han-Wen Nienhuys */ -#include +#include +using namespace std; #include "break-align-interface.hh" diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc index 5f6edb9ceb..bed8b97c86 100644 --- a/lily/break-substitution.cc +++ b/lily/break-substitution.cc @@ -8,6 +8,7 @@ #include #include +using namespace std; #include "grob-array.hh" #include "item.hh" diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index fa54f7a8dc..c0fb2fe4b1 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -9,6 +9,7 @@ */ #include +using namespace std; #include "context.hh" #include "bar-line.hh" diff --git a/lily/cluster.cc b/lily/cluster.cc index 10b408a88f..b089e5cb5a 100644 --- a/lily/cluster.cc +++ b/lily/cluster.cc @@ -11,6 +11,7 @@ #include "cluster.hh" #include +using namespace std; #include "spanner.hh" #include "item.hh" diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index ede37181b9..b313fea105 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -5,6 +5,7 @@ */ #include +using namespace std; #include "rhythmic-head.hh" #include "output-def.hh" diff --git a/lily/custos.cc b/lily/custos.cc index 515e04f761..ae32e8562b 100644 --- a/lily/custos.cc +++ b/lily/custos.cc @@ -14,7 +14,8 @@ */ #include -#include // rint +#include // rint +using namespace std; #include "custos.hh" #include "direction.hh" diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc index e4dd194632..3254e5e819 100644 --- a/lily/dimension-cache.cc +++ b/lily/dimension-cache.cc @@ -6,7 +6,8 @@ (c) 1998--2005 Han-Wen Nienhuys */ -#include +#include +using namespace std; #include "dimension-cache.hh" #include "warn.hh" diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 0acae3b414..a8d3e73570 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -9,8 +9,9 @@ #include "dot-column.hh" #include -#include +#include #include +using namespace std; #include "dots.hh" #include "rhythmic-head.hh" @@ -82,7 +83,7 @@ struct Dot_position } }; -typedef std::map Dot_configuration; +typedef map Dot_configuration; /* Value CFG according. diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc index 02bb19f1d1..13204180a6 100644 --- a/lily/drum-note-engraver.cc +++ b/lily/drum-note-engraver.cc @@ -5,6 +5,7 @@ */ #include +using namespace std; #include "rhythmic-head.hh" #include "engraver.hh" diff --git a/lily/easy-notation.cc b/lily/easy-notation.cc index bd24ffbab2..879ded5483 100644 --- a/lily/easy-notation.cc +++ b/lily/easy-notation.cc @@ -8,6 +8,9 @@ #include "note-head.hh" +#include +using namespace std; + #include "text-interface.hh" #include "grob.hh" #include "output-def.hh" @@ -16,7 +19,6 @@ #include "font-interface.hh" #include "staff-symbol-referencer.hh" #include "stem.hh" -#include MAKE_SCHEME_CALLBACK (Note_head, brew_ez_stencil, 1); SCM diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc index de656168cb..11000e10b5 100644 --- a/lily/file-name-map.cc +++ b/lily/file-name-map.cc @@ -7,11 +7,12 @@ */ #include +using namespace std; #include "file-name-map.hh" #include "lily-guile.hh" -std::map file_name_map_global; +map file_name_map_global; String map_file_name (String s) diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 5909b7ee95..48ec34183e 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -10,8 +10,9 @@ #include "font-metric.hh" -#include +#include #include +using namespace std; #include "dimensions.hh" #include "modified-font-metric.hh" diff --git a/lily/font-select.cc b/lily/font-select.cc index 61030405fb..c91f713b17 100644 --- a/lily/font-select.cc +++ b/lily/font-select.cc @@ -6,7 +6,8 @@ (c) 2003--2005 Han-Wen Nienhuys */ -#include +#include +using namespace std; #include "dimensions.hh" #include "all-font-metrics.hh" diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc index 124d6b5539..9a1fb9daef 100644 --- a/lily/function-documentation.cc +++ b/lily/function-documentation.cc @@ -7,6 +7,7 @@ */ #include +using namespace std; #include "protected-scm.hh" #include "string.hh" diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index 2c1fb2bbc0..d5f07b53d0 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -9,9 +9,10 @@ #include "config.hh" -#include /* isinf */ -#include -#include /* memset */ +#include /* isinf */ +#include +#include /* memset */ +using namespace std; #include "international.hh" #include "libc-extension.hh" diff --git a/lily/global-context.cc b/lily/global-context.cc index 3ecc3b9aaf..922015717d 100644 --- a/lily/global-context.cc +++ b/lily/global-context.cc @@ -9,6 +9,7 @@ #include "global-context.hh" #include +using namespace std; #include "warn.hh" #include "music.hh" diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index 6310acb874..f5d78b9f51 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -8,8 +8,9 @@ #include "gourlay-breaking.hh" -#include // rint +#include // rint #include +using namespace std; #include "warn.hh" #include "main.hh" diff --git a/lily/grob-property.cc b/lily/grob-property.cc index bf1663e530..04acbf4fc1 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -3,7 +3,8 @@ */ #include -#include +#include +using namespace std; #include "main.hh" #include "input-smob.hh" diff --git a/lily/grob.cc b/lily/grob.cc index b8b82271ca..cfb8c319f9 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -9,7 +9,8 @@ #include "grob.hh" #include -#include +#include +using namespace std; #include "main.hh" #include "input-smob.hh" diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index 7cde6bfc37..df4802fa93 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -9,6 +9,7 @@ #include "includable-lexer.hh" #include +using namespace std; #include "config.hh" #include "file-path.hh" diff --git a/lily/include/afm.hh b/lily/include/afm.hh index 3f815e9461..7f436f470a 100644 --- a/lily/include/afm.hh +++ b/lily/include/afm.hh @@ -11,6 +11,7 @@ #define AFM_HH #include +using namespace std; #include "array.hh" #include "font-metric.hh" @@ -40,7 +41,7 @@ protected: AFM_CharMetricInfo const *find_ascii_metric (int) const; Array ascii_to_metric_idx_; - std::map name_to_metric_dict_; + map name_to_metric_dict_; Adobe_font_metric (AFM_Font_info *); }; diff --git a/lily/include/context.hh b/lily/include/context.hh index df053d160b..ca7a40b560 100644 --- a/lily/include/context.hh +++ b/lily/include/context.hh @@ -10,6 +10,7 @@ #define CONTEXT_HH #include +using namespace std; #include "moment.hh" #include "lily-proto.hh" @@ -28,8 +29,8 @@ private: int iterator_count_; bool init_; - std::map grob_counts_; - std::map context_counts_; + map grob_counts_; + map context_counts_; protected: Object_key const *key_; diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh index b7edcbb29e..afeb4a35bc 100644 --- a/lily/include/includable-lexer.hh +++ b/lily/include/includable-lexer.hh @@ -10,7 +10,6 @@ #define INCLUDABLE_LEXER_HH #ifndef LEXER_CC -using namespace std; #include #endif diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh index 6387feb383..4c8ed07edc 100644 --- a/lily/include/midi-stream.hh +++ b/lily/include/midi-stream.hh @@ -8,6 +8,7 @@ #define MIDI_STREAM_HH #include +using namespace std; #include "string.hh" diff --git a/lily/include/misc.hh b/lily/include/misc.hh index b40e936e9e..8ea878cc2e 100644 --- a/lily/include/misc.hh +++ b/lily/include/misc.hh @@ -10,6 +10,7 @@ #define MISC_HH #include +using namespace std; #include "array.hh" #include "interval.hh" diff --git a/lily/include/moment.hh b/lily/include/moment.hh index ba8164f031..4c0b68e1ee 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -63,7 +63,7 @@ INSTANTIATE_COMPARE (Moment const &, Moment::compare); Moment robust_scm2moment (SCM, Moment); #ifdef STREAM_SUPPORT -std::ostream &operator << (std::ostream &, Moment const &); +ostream &operator << (ostream &, Moment const &); #endif bool moment_less (SCM a, SCM b); diff --git a/lily/include/object-key-dumper.hh b/lily/include/object-key-dumper.hh index 457b273c44..df5db43035 100644 --- a/lily/include/object-key-dumper.hh +++ b/lily/include/object-key-dumper.hh @@ -10,12 +10,13 @@ #define OBJECT_KEY_DUMPER_HH #include +using namespace std; #include "object-key.hh" -typedef std::map Key_to_key_map; -typedef std::map Pointer_to_int_map; -typedef std::map Int_to_key_map; +typedef map Key_to_key_map; +typedef map Pointer_to_int_map; +typedef map Int_to_key_map; class Object_key_dumper { diff --git a/lily/include/object-key-undumper.hh b/lily/include/object-key-undumper.hh index 02d98aab1a..8380dee545 100644 --- a/lily/include/object-key-undumper.hh +++ b/lily/include/object-key-undumper.hh @@ -10,9 +10,11 @@ #define OBJECT_KEY_UNDUMPER_HH #include +using namespace std; + #include "object-key.hh" -typedef std::map Int_to_key_map; +typedef map Int_to_key_map; struct Object_key_undumper { diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh index 05d6f54d33..e75b4c62d4 100644 --- a/lily/include/open-type-font.hh +++ b/lily/include/open-type-font.hh @@ -10,10 +10,12 @@ #define OPEN_TYPE_FONT_HH #include +using namespace std; + #include "freetype.hh" #include "font-metric.hh" -typedef std::map Index_to_charcode_map; +typedef map Index_to_charcode_map; Index_to_charcode_map make_index_to_charcode_map (FT_Face face); class Open_type_font : public Font_metric diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh index 1a61070348..7668c41efe 100644 --- a/lily/include/source-file.hh +++ b/lily/include/source-file.hh @@ -10,6 +10,7 @@ #define SOURCE_FILE_HH #include +using namespace std; #include "string.hh" #include "protected-scm.hh" @@ -33,7 +34,7 @@ public: char const *to_str0 () const; virtual String quote_input (char const *pos_str0) const; - std::istream *get_istream (); + istream *get_istream (); bool contains (char const *pos_str0) const; int length () const; virtual int get_line (char const *pos_str0) const; @@ -66,7 +67,7 @@ public: private: Link_array newline_locations_; - std::istream *istream_; + istream *istream_; char *contents_str0_; int length_; void load_stdin (); diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh index 3349cbdd35..8b57763d79 100644 --- a/lily/include/stencil.hh +++ b/lily/include/stencil.hh @@ -9,6 +9,7 @@ #define STENCIL_HH #include // size_t +using namespace std; #include "lily-proto.hh" #include "box.hh" diff --git a/lily/include/stream.hh b/lily/include/stream.hh index c3a26f108c..1178fc51ae 100644 --- a/lily/include/stream.hh +++ b/lily/include/stream.hh @@ -11,16 +11,17 @@ #include #include +using namespace std; #include "string.hh" #if __GNUC__ > 2 -std::ostream *open_file_stream (String file_name, - std::ios_base::openmode mode = std::ios::out); +ostream *open_file_stream (String file_name, + ios_base::openmode mode = ios::out); #else -std::ostream *open_file_stream (String file_name, int mode = ios::out); +ostream *open_file_stream (String file_name, int mode = ios::out); #endif -void close_file_stream (std::ostream *os); +void close_file_stream (ostream *os); #endif /* STREAM_HH */ diff --git a/lily/include/tweak-registration.hh b/lily/include/tweak-registration.hh index ea52b1e41b..468145f7aa 100644 --- a/lily/include/tweak-registration.hh +++ b/lily/include/tweak-registration.hh @@ -10,11 +10,12 @@ #define TWEAK_REGISTRATION_HH #include +using namespace std; #include "lily-proto.hh" #include "object-key.hh" -typedef std::map Tweak_map; +typedef map Tweak_map; class Tweak_registry { diff --git a/lily/input.cc b/lily/input.cc index d6d33e2247..3d377f60f7 100644 --- a/lily/input.cc +++ b/lily/input.cc @@ -9,6 +9,7 @@ #include "input.hh" #include +using namespace std; #include "source.hh" #include "source-file.hh" diff --git a/lily/keyword.cc b/lily/keyword.cc index 70c84e59e2..684bc189e3 100644 --- a/lily/keyword.cc +++ b/lily/keyword.cc @@ -6,6 +6,7 @@ #include #include +using namespace std; /* for qsort */ int tabcmp (Keyword_ent const &p1, Keyword_ent const &p2) diff --git a/lily/least-squares.cc b/lily/least-squares.cc index f6d70478ce..b851c434eb 100644 --- a/lily/least-squares.cc +++ b/lily/least-squares.cc @@ -33,7 +33,7 @@ minimise_least_squares (Real *coef, Real *offset, *coef = 0.0; *offset = 0.; - Real den = (N *sqx - sqr (sx)); + Real den = (N * sqx - sqr (sx)); if (!N || !den) { programming_error ("minimise_least_squares (): Nothing to minimise"); diff --git a/lily/ledger-line-spanner.cc b/lily/ledger-line-spanner.cc index fe094e681f..1cf32af56f 100644 --- a/lily/ledger-line-spanner.cc +++ b/lily/ledger-line-spanner.cc @@ -7,6 +7,7 @@ */ #include +using namespace std; #include "item.hh" #include "note-head.hh" @@ -188,7 +189,7 @@ struct Ledger_request } }; -typedef std::map < int, Drul_array > Ledger_requests; +typedef map < int, Drul_array > Ledger_requests; /* TODO: ledger share a lot of info. Lots of room to optimize away diff --git a/lily/lexer.ll b/lily/lexer.ll index bb9ee2271a..a5fbdb6a94 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -22,9 +22,10 @@ */ -#include -#include -#include + +#include +#include +#include /* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks when building the actual lexer. */ @@ -32,7 +33,6 @@ #define LEXER_CC #include - using namespace std; #include "music-function.hh" @@ -952,3 +952,35 @@ music_function_type (SCM func) return MUSIC_FUNCTION_SCM; } + +/* Shut up lexer warnings. */ +#if YY_STACK_USED + +static void +yy_push_state (int) +{ +} + +static void +yy_pop_state () +{ +} + +static int +yy_top_state () +{ + return 0; +} + +static void +silence_lexer_warnings () +{ + (void) yy_start_stack_ptr; + (void) yy_start_stack_depth; + (void) yy_start_stack; + (void) yy_push_state; + (void) yy_pop_state; + (void) yy_top_state; + (void) silence_lexer_warnings; +} +#endif diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 856c9d30cd..664dcf2905 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -13,6 +13,7 @@ #include #include /* strdup, strchr */ #include +using namespace std; #include "config.hh" diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc index ad16d150e5..57475d37d3 100644 --- a/lily/lily-lexer.cc +++ b/lily/lily-lexer.cc @@ -10,6 +10,7 @@ #include #include +using namespace std; #include "scm-hash.hh" #include "interval.hh" diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 96841816a5..cbfe9dd306 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -8,7 +8,8 @@ #include "line-spanner.hh" -#include +#include +using namespace std; #include "spanner.hh" #include "output-def.hh" diff --git a/lily/lookup.cc b/lily/lookup.cc index 91e67d1510..f87be0b3e1 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -10,8 +10,9 @@ #include "lookup.hh" -#include +#include #include +using namespace std; #include "line-interface.hh" #include "warn.hh" diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index ad8b108e78..ebf3c41ce5 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -8,7 +8,8 @@ #include "lyric-extender.hh" -#include +#include +using namespace std; #include "warn.hh" #include "lookup.hh" diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index f027211226..f68719595b 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -8,7 +8,8 @@ #include "lyric-hyphen.hh" -#include +#include +using namespace std; #include "lookup.hh" #include "output-def.hh" diff --git a/lily/main.cc b/lily/main.cc index 8aba4701fe..3fc4637273 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -11,8 +11,10 @@ #include #include #include +#include +using namespace std; + #include -#include #include #include diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 2e4bae6f27..897475e6af 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -7,6 +7,7 @@ */ #include +using namespace std; #include "bar-line.hh" #include "context.hh" diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index add51960b9..250a0f9411 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -7,7 +7,8 @@ Pal Benko */ -#include +#include +using namespace std; #include "mensural-ligature.hh" #include "item.hh" diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc index 15375e542b..803244967f 100644 --- a/lily/metronome-engraver.cc +++ b/lily/metronome-engraver.cc @@ -7,6 +7,7 @@ */ #include +using namespace std; #include "engraver.hh" diff --git a/lily/midi-def.cc b/lily/midi-def.cc index 0905c4c2f7..a806675016 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -6,7 +6,8 @@ (c) 1997--2005 Jan Nieuwenhuizen */ -#include +#include +using namespace std; #include "misc.hh" #include "output-def.hh" diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index 87a1b581d3..ffe5196b63 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -8,7 +8,8 @@ #include "midi-stream.hh" -#include +#include +using namespace std; #include "stream.hh" #include "string-convert.hh" diff --git a/lily/misc.cc b/lily/misc.cc index bb8a05201c..809c1b7169 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -7,7 +7,8 @@ Jan Nieuwenhuizen */ -#include +#include +using namespace std; #include "misc.hh" #include "string.hh" diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc index 5a616198aa..e3f419cf76 100644 --- a/lily/modified-font-metric.cc +++ b/lily/modified-font-metric.cc @@ -6,6 +6,7 @@ (c) 1999--2005 Han-Wen Nienhuys */ #include +using namespace std; #include "modified-font-metric.hh" #include "pango-font.hh" diff --git a/lily/moment.cc b/lily/moment.cc index 90c3a2da2c..d561aa7607 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -172,8 +172,8 @@ Moment::operator - () const } #ifdef STREAM_SUPPORT -std::ostream & -operator << (std::ostream &os, Moment const &m) +ostream & +operator << (ostream &os, Moment const &m) { os << m.to_string (); return os; diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 022573f675..600eb2e702 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -13,6 +13,7 @@ #include "music-iterator.hh" #include +using namespace std; #include "warn.hh" #include "context.hh" diff --git a/lily/note-collision.cc b/lily/note-collision.cc index cbb4d07a74..353c40037b 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -8,7 +8,8 @@ #include "note-collision.hh" -#include +#include +using namespace std; #include "warn.hh" #include "note-column.hh" diff --git a/lily/note-column.cc b/lily/note-column.cc index 1729e6b432..974f220b79 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -8,7 +8,8 @@ #include "note-column.hh" -#include // ceil +#include // ceil +using namespace std; #include "axis-group-interface.hh" #include "stem.hh" diff --git a/lily/note-head.cc b/lily/note-head.cc index fd7efe124f..416dd0e2b9 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -8,10 +8,9 @@ #include "note-head.hh" -#include +#include #include #include // min, max - using namespace std; #include "directional-element-interface.hh" diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index c5731ab396..34c65a1cbd 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -7,6 +7,7 @@ #include "engraver.hh" #include +using namespace std; #include "rhythmic-head.hh" #include "output-def.hh" diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index cd0c67c057..a82a14f0e9 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -8,8 +8,10 @@ #include "open-type-font.hh" +#include +using namespace std; + #include -#include #include "dimensions.hh" #include "modified-font-metric.hh" diff --git a/lily/pango-select.cc b/lily/pango-select.cc index 31f9f79e77..3f654ff324 100644 --- a/lily/pango-select.cc +++ b/lily/pango-select.cc @@ -5,7 +5,8 @@ (c) 2004--2005 Han-Wen Nienhuys */ -#include +#include +using namespace std; #include "dimensions.hh" #include "all-font-metrics.hh" diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index de9c16fc87..e69d33bd95 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -9,8 +9,9 @@ #include "paper-outputter.hh" -#include +#include #include +using namespace std; #include "dimensions.hh" #include "file-name.hh" diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index db09db8754..7cb8b34c09 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -9,6 +9,7 @@ #include "parse-scm.hh" #include +using namespace std; #include "main.hh" #include "paper-book.hh" diff --git a/lily/parser.yy b/lily/parser.yy index 3b72ec290b..475e556ace 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -20,10 +20,10 @@ FIXME: #include "config.hh" -#include -#include -#include - +#include +#include +#include +using namespace std; #include "book.hh" #include "context-def.hh" diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc index a8c2a4d0ab..f3d81ba543 100644 --- a/lily/percent-repeat-item.cc +++ b/lily/percent-repeat-item.cc @@ -8,7 +8,8 @@ #include "percent-repeat-item.hh" -#include +#include +using namespace std; #include "lookup.hh" #include "font-interface.hh" diff --git a/lily/performance.cc b/lily/performance.cc index 087522ebb4..985901c01c 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -9,6 +9,7 @@ #include "performance.hh" #include +using namespace std; #include "audio-column.hh" #include "audio-staff.hh" diff --git a/lily/pfb.cc b/lily/pfb.cc index f255cb846e..8d1753de5a 100644 --- a/lily/pfb.cc +++ b/lily/pfb.cc @@ -9,6 +9,7 @@ #include #include #include +using namespace std; #include "program-option.hh" #include "source-file.hh" diff --git a/lily/program-option.cc b/lily/program-option.cc index de93d2dd76..03173d9c27 100644 --- a/lily/program-option.cc +++ b/lily/program-option.cc @@ -9,7 +9,8 @@ #include "program-option.hh" #include -#include +#include +using namespace std; #include "string-convert.hh" #include "protected-scm.hh" diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 8ad587e88b..21ec8c9166 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -8,7 +8,8 @@ #include "rest-collision.hh" -#include // ceil. +#include // ceil. +using namespace std; #include "warn.hh" #include "note-column.hh" diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index b68af1d4ee..785facd098 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -10,11 +10,10 @@ #include #include +using namespace std; #include "ly-smobs.icc" -using namespace std; - /* Return: number of objects. */ @@ -84,8 +83,8 @@ Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*) } bool -Scheme_hash_table::try_retrieve (SCM k, SCM *v) -{ +Scheme_hash_table::try_retrieve (SCM k, SCM *v){ + SCM handle = scm_hashq_get_handle (hash_tab_, k); if (scm_is_pair (handle)) { diff --git a/lily/score.cc b/lily/score.cc index 75935f57ef..b47c6d099b 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -9,6 +9,7 @@ #include "score.hh" #include +using namespace std; #include "book.hh" #include "cpu-timer.hh" diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 97790b3830..05539cd1e3 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -8,8 +8,9 @@ #include "side-position-interface.hh" -#include // ceil. +#include // ceil. #include +using namespace std; #include "note-head.hh" #include "warn.hh" @@ -21,8 +22,6 @@ #include "staff-symbol-referencer.hh" #include "string-convert.hh" -using namespace std; - void Side_position_interface::add_support (Grob *me, Grob *e) { diff --git a/lily/simple-spacer-scheme.cc b/lily/simple-spacer-scheme.cc index 59027b3c38..6c95f42124 100644 --- a/lily/simple-spacer-scheme.cc +++ b/lily/simple-spacer-scheme.cc @@ -7,7 +7,8 @@ */ #include -#include +#include +using namespace std; #include "paper-column.hh" #include "spring.hh" diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index a37f040c86..2cccb6d83c 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -10,7 +10,8 @@ */ #include -#include +#include +using namespace std; #include "libc-extension.hh" // isinf #include "simple-spacer.hh" diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc index 4e14589d81..6f86fd432a 100644 --- a/lily/slur-configuration.cc +++ b/lily/slur-configuration.cc @@ -8,7 +8,8 @@ #include "slur-configuration.hh" -#include +#include +using namespace std; #include "stem.hh" #include "warn.hh" diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index b5a91f4678..bcb65320ed 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -7,7 +7,8 @@ Jan Nieuwenhuizen */ -#include +#include +using namespace std; #include "slur-scoring.hh" #include "libc-extension.hh" @@ -471,7 +472,8 @@ Slur_score_state::get_y_attachment_range () const if (extremes_[d].note_column_) { end_ys[d] = dir_ - * max (max (dir_ * (base_attachments_[d][Y_AXIS] + parameters_.region_size_ * dir_), + * max (max (dir_ * (base_attachments_[d][Y_AXIS] + + parameters_.region_size_ * dir_), dir_ * (dir_ + extremes_[d].note_column_->extent (common_[Y_AXIS], Y_AXIS)[dir_])), dir_ * base_attachments_[-d][Y_AXIS]); } diff --git a/lily/slur.cc b/lily/slur.cc index bdf7539241..8159e0dd3d 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -9,7 +9,8 @@ #include "slur.hh" -#include +#include +using namespace std; #include "beam.hh" #include "bezier.hh" diff --git a/lily/source-file.cc b/lily/source-file.cc index 74bb5c3b40..13661d77ef 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -14,7 +14,7 @@ #if HAVE_UTF8_WCHAR_H #include /* mbrtowc */ #else -#include /* mbrtowc */ +#include /* mbrtowc */ #endif #include @@ -25,6 +25,7 @@ #include #define istringstream(x) istrstream (x, length ()) #endif +using namespace std; #include "warn.hh" #include "file-name-map.hh" @@ -128,17 +129,17 @@ Source_file::tell () const return pos_str0_ - contents_str0_; } -std::istream * +istream * Source_file::get_istream () { if (!istream_) { if (length ()) // can-t this be done without such a hack? - istream_ = new std::istringstream (to_str0 ()); + istream_ = new istringstream (to_str0 ()); else { - istream_ = new std::istringstream (""); - istream_->setstate (std::ios::eofbit); + istream_ = new istringstream (""); + istream_->setstate (ios::eofbit); // istream_->set (ios::eofbit); } } diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 4c78ab8240..12012be46d 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -9,7 +9,8 @@ #include "spaceable-grob.hh" #include -#include +#include +using namespace std; #include "warn.hh" #include "spring.hh" diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 2b9da0b802..0581deb8bd 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -6,8 +6,9 @@ (c) 1999--2005 Han-Wen Nienhuys */ -#include +#include #include +using namespace std; #include "spacing-spanner.hh" #include "paper-column.hh" diff --git a/lily/spanner.cc b/lily/spanner.cc index 2c961fffc1..33e1a7cb24 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -8,7 +8,8 @@ #include "spanner.hh" -#include +#include +using namespace std; #include "pointer-group-interface.hh" #include "libc-extension.hh" diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 735436e142..48e0c09f6b 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -9,6 +9,7 @@ #include "staff-spacing.hh" #include +using namespace std; #include "paper-column.hh" #include "separation-item.hh" @@ -76,8 +77,7 @@ Staff_spacing::next_note_correction (Grob *me, stem_posns.intersect (bar_size); Real corr = min (abs (stem_posns.length () / 7.0), 1.0); - corr - *= robust_scm2double (me->get_property ("stem-spacing-correction"), 1); + corr *= robust_scm2double (me->get_property ("stem-spacing-correction"), 1); if (d != DOWN) corr = 0.0; diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 80db80ba06..7ad89794f9 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -8,7 +8,8 @@ #include "staff-symbol-referencer.hh" -#include +#include +using namespace std; #include "staff-symbol.hh" #include "output-def.hh" diff --git a/lily/stem.cc b/lily/stem.cc index bd42bbb1e9..06940e387f 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -15,7 +15,8 @@ #include "stem.hh" -#include // rint +#include // rint +using namespace std; #include "lookup.hh" #include "directional-element-interface.hh" @@ -608,7 +609,8 @@ Stem::width_callback (SCM e, SCM ax) if (is_invisible (me)) r.set_empty (); - else if (unsmob_grob (me->get_object ("beam")) || abs (duration_log (me)) <= 2) + else if (unsmob_grob (me->get_object ("beam")) + || abs (duration_log (me)) <= 2) { r = Interval (-1, 1); r *= thickness (me) / 2; diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc index cc046d51c3..1bf2eab213 100644 --- a/lily/stencil-scheme.cc +++ b/lily/stencil-scheme.cc @@ -6,7 +6,8 @@ (c) 1997--2005 Han-Wen Nienhuys */ -#include +#include +using namespace std; #include "font-metric.hh" #include "libc-extension.hh" diff --git a/lily/stencil.cc b/lily/stencil.cc index b8bad87875..fd8a19d3e2 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -8,7 +8,8 @@ #include "stencil.hh" -#include +#include +using namespace std; #include "dimensions.hh" #include "font-metric.hh" diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 24be5bb595..33ba97f165 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -8,7 +8,8 @@ #include "system-start-delimiter.hh" -#include +#include +using namespace std; #include "spanner.hh" #include "axis-group-interface.hh" diff --git a/lily/system.cc b/lily/system.cc index 932e7ce8c6..4ce6a9c00e 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -8,7 +8,8 @@ #include "system.hh" -#include +#include +using namespace std; #include "align-interface.hh" #include "axis-group-interface.hh" diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc index 2aad5ce6ee..49a760bec1 100644 --- a/lily/tab-note-heads-engraver.cc +++ b/lily/tab-note-heads-engraver.cc @@ -8,6 +8,7 @@ #include #include +using namespace std; #include "rhythmic-head.hh" #include "output-def.hh" diff --git a/lily/text-interface.cc b/lily/text-interface.cc index ab23ee70e5..4c28ee8671 100644 --- a/lily/text-interface.cc +++ b/lily/text-interface.cc @@ -9,7 +9,8 @@ #include "text-interface.hh" -#include +#include +using namespace std; #include "main.hh" #include "config.hh" diff --git a/lily/tie-column.cc b/lily/tie-column.cc index df6b7f18c8..76d45004cb 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -8,8 +8,7 @@ #include "tie-column.hh" -#include -#include +#include #include "skyline.hh" #include "warn.hh" @@ -20,6 +19,8 @@ #include "directional-element-interface.hh" #include "tie-column-format.hh" +using namespace std; + void Tie_column::add_tie (Grob *me, Grob *tie) { @@ -93,7 +94,7 @@ Tie_column::new_directions (Grob *me) if (ties.size() == 1) { Tie::set_default_control_points (ties[0]); - return ; + return; } ties.sort (&Tie::compare); diff --git a/lily/tie-helper.cc b/lily/tie-helper.cc index 132e7c303c..8d5a427615 100644 --- a/lily/tie-helper.cc +++ b/lily/tie-helper.cc @@ -7,7 +7,8 @@ */ -#include +#include +using namespace std; #include "tie.hh" #include "bezier.hh" diff --git a/lily/tie.cc b/lily/tie.cc index cf2c4d5a38..40664a67e7 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -8,7 +8,8 @@ #include "tie.hh" -#include +#include +using namespace std; #include "spanner.hh" #include "lookup.hh" diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 3442e2d522..a95e666110 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -29,7 +29,8 @@ todo: handle breaking elegantly. */ -#include +#include +using namespace std; #include "tuplet-bracket.hh" #include "line-interface.hh" diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc index 62a72141a1..eefe2fe760 100644 --- a/lily/vaticana-ligature.cc +++ b/lily/vaticana-ligature.cc @@ -8,7 +8,8 @@ #include "vaticana-ligature.hh" -#include +#include +using namespace std; #include "item.hh" #include "font-interface.hh" diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc index 10e4a228b0..36b7e5cf0d 100644 --- a/lily/volta-bracket.cc +++ b/lily/volta-bracket.cc @@ -7,6 +7,7 @@ */ #include +using namespace std; #include "warn.hh" #include "font-interface.hh" diff --git a/python/midi.c b/python/midi.c index 5d5e7fba47..168e9f7749 100644 --- a/python/midi.c +++ b/python/midi.c @@ -34,7 +34,7 @@ static PyObject *Midi_warning; static PyObject * midi_error (char const *func, char *s) { - char*dest = (char*) malloc (sizeof (char) * (strlen (func) + strlen (s) + 1)); + char *dest = (char*) malloc (sizeof (char) * (strlen (func) + strlen (s) + 1)); strcpy (dest, func); strcat (dest, s); PyErr_SetString (Midi_error, dest); diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make index 40d03d1aa0..d5e67b889c 100644 --- a/stepmake/stepmake/c++-vars.make +++ b/stepmake/stepmake/c++-vars.make @@ -2,6 +2,9 @@ include $(stepdir)/compile-vars.make EXTRA_CXXFLAGS= -W -Wall -Wconversion +#ifeq ($(MY_PATCH_LEVEL),) +EXTRA_CXXFLAGS += -Werror +#endif ALL_CXXFLAGS = $(CXXFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $($(PACKAGE)_CFLAGS) $($(PACKAGE)_CXXFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS) -- 2.39.2