Imported Upstream version 2.16.0

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

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index be7074c242bec76dc2a599e4e9359e6ad9e73556..cc6f70a9c82f03ce701885118ce7af1f8a8c0ad2 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Han-Wen Nienhuys
+  Copyright (C) 1996--2012 Han-Wen Nienhuys
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 template<class T>
 struct Interval_t : public Drul_array<T>
 {
-  Drul_array<T>::at;
+  using Drul_array<T>::at;
 
   static T infinity ();
   static string T_to_string (T arg);
@@ -110,10 +110,10 @@ struct Interval_t : public Drul_array<T>
   {
     if (!is_empty ())
       {
-       at (LEFT) *= r;
-       at (RIGHT) *= r;
-       if (r < T (0))
-         swap ();
+        at (LEFT) *= r;
+        at (RIGHT) *= r;
+        if (r < T (0))
+          swap ();
       }
     return *this;
   }
@@ -228,7 +228,7 @@ Interval_t<T>::center () const
 }
 
 typedef Interval_t<Real> Interval;
-typedef Interval_t<int> Slice; // weird name
+typedef Interval_t<int> Slice;  // weird name
 
 
 #endif // INTERVAL_HH