Imported Upstream version 2.16.0

[lilypond.git] / flower / include / axis.hh

diff --git a/flower/include/axis.hh b/flower/include/axis.hh
index 4d575a38aeb276dbd5c87bd06cba729a66f9f02d..f5ec6ca39a2c2ec4452c16d353a40151e3c68644 100644 (file)
--- a/flower/include/axis.hh
+++ b/flower/include/axis.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,14 +21,13 @@
 #define AXES_HH
 
 #include <cassert>
-using namespace std;
 
 enum Axis
-  {
-    X_AXIS = 0,
-    Y_AXIS = 1,
-    NO_AXES = 2,
-  };
+{
+  X_AXIS = 0,
+  Y_AXIS = 1,
+  NO_AXES = 2,
+};
 
 static inline
 Axis