X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbezier.hh;h=54acce15fc11b818dbec4801ffbfc3d1fd273dd6;hb=f02831f92e71ce43e3b67e06c0d46dc19ad9bde3;hp=2222c801252f22573579ca87eaa50b774eb42024;hpb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;p=lilypond.git

diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index 2222c80125..54acce15fc 100644
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -39,10 +39,10 @@ public:
   Bezier extract (Real, Real) const;
 
   Real get_other_coordinate (Axis a, Real x) const;
-  std::vector<Real> get_other_coordinates (Axis a, Real x) const;
-  std::vector<Real> solve_point (Axis, Real coordinate) const;
+  vector<Real> get_other_coordinates (Axis a, Real x) const;
+  vector<Real> solve_point (Axis, Real coordinate) const;
   Real minmax (Axis, Real, Real, Direction) const;
-  std::vector<Real> solve_derivative (Offset) const;
+  vector<Real> solve_derivative (Offset) const;
   Interval extent (Axis) const;
   Interval control_point_extent (Axis) const;
 
@@ -55,15 +55,15 @@ public:
 
   /*
     Bezier curves always have 4 control points. Making this into an
-    std::vector<> gives unnecessary overhead, and makes debugging a royal
+    vector<> gives unnecessary overhead, and makes debugging a royal
     pain.  */
 
   Offset control_[4];
 };
 
-void scale (std::vector<Offset> *array, Real xscale, Real yscale);
-void rotate (std::vector<Offset> *array, Real phi);
-void translate (std::vector<Offset> *array, Offset o);
+void scale (vector<Offset> *array, Real xscale, Real yscale);
+void rotate (vector<Offset> *array, Real deg);
+void translate (vector<Offset> *array, Offset o);
 
 Bezier slur_shape (Real width, Real height_limit,
                    Real height_proportion);