* configure.in (--enable-std-string): New option.

[lilypond.git] / flower / axis.cc

diff --git a/flower/axis.cc b/flower/axis.cc
index 0bf70a244eca3e39b31c6c4bb79b19c152e8c647..01ec24096b10f89597c4f3aef1f3fdef34e458e1 100644 (file)
--- a/flower/axis.cc
+++ b/flower/axis.cc
@@ -1,38 +1,15 @@
 /*
   axis.cc -- implement Axis
 
-
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <assert.h>
-#include "axes.hh"
+#include "axis.hh"
+
 #include "string.hh"
 
 String
-axis_name_str (Axis a)
+axis_name_string (Axis a)
 {
-  return to_str (char (a + 'x'));
+  return to_string (char (a + 'x'));
 }
-
-/*
-  TODO inline these.
- */
-Axis
-post_incr (Axis &a)
-{
-  assert (a < NO_AXES);
-  Axis b= a;
-  a = Axis (int (a) + 1);
-  return b;
-}
-
-Axis
-incr (Axis &a)
-{
-  assert (a < NO_AXES);
-  a = Axis (int (a) + 1);
-  return a;
-}
-