Merge with master

[lilypond.git] / flower / offset.cc

diff --git a/flower/offset.cc b/flower/offset.cc
index b45809e0b9ed82322fb243a18fef7a748540f1c3..f578b191f9a4c8b93f4f694a8b8f06beefb522c8 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,19 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "offset.hh"
 
 
 #ifndef STANDALONE
-std::string
+string
 Offset::to_string () const
 {
-  std::string s;
-  s = std::string (" (") + std::to_string (coordinate_a_[X_AXIS]) + ", "
-    + std::to_string (coordinate_a_[Y_AXIS]) + ")";
+  string s;
+  s = string (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", "
+    + ::to_string (coordinate_a_[Y_AXIS]) + ")";
   return s;
 }
 #endif