Merge branch 'origin' of /home/lilydev/vc/gub/downloads/lilypond into master-hanwen

[lilypond.git] / flower / offset.cc

diff --git a/flower/offset.cc b/flower/offset.cc
index f54772daa9c3747d791572b8ac205e159ee2f833..a0e87b58cf57984734386aabc3a6b3dc8ea99b7d 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,21 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "offset.hh"
 
 
-#include <math.h>
-// #include <cmath>  // undefines isnan on MacOS X.  
-
 #ifndef STANDALONE
-String
+string
 Offset::to_string () const
 {
-  String s;
-  s = String (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
+  string s;
+  s = string (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
     + ::to_string (coordinate_a_[Y_AXIS]) + ")";
   return s;
 }
@@ -84,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