Issue 4550 (2/2) Avoid "using namespace std;" in included files

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

diff --git a/flower/include/polynomial.hh b/flower/include/polynomial.hh
index c58cb935004e2d324381f4b8229d949e63ce7960..379609bcaf3d7b3b4b5be06aab2a471177cb8648 100644 (file)
--- a/flower/include/polynomial.hh
+++ b/flower/include/polynomial.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1993--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1993--2015 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
@@ -24,6 +24,7 @@
 #ifndef POLY_H
 #define POLY_H
 
+#include <sys/types.h>
 #include "std-vector.hh"
 #include "arithmetic-operator.hh"
 #include "real.hh"
@@ -32,10 +33,10 @@
 struct Polynomial
 {
   /// degree of polynomial
-  int degree ()const;
+  ssize_t degree ()const;
 
   /// coefficients
-  vector<Real> coefs_;
+  std::vector<Real> coefs_;
 
   // leading coef
   Real &lc ();
@@ -45,8 +46,8 @@ struct Polynomial
   void print () const;
   Real eval (Real) const;
   Real minmax (Real, Real, bool) const;
-  void print_sols (vector<Real>) const;
-  void check_sols (vector<Real>) const;
+  void print_sols (std::vector<Real>) const;
+  void check_sols (std::vector<Real>) const;
   void check_sol (Real x) const;
   static Polynomial multiply (const Polynomial &p1, const Polynomial &p2);
   static Polynomial power (int exponent, const Polynomial &src);
@@ -72,11 +73,11 @@ struct Polynomial
 
   void debug_clean ();
 
-  vector<Real> solve_quadric ()const;
-  vector<Real> solve_cubic ()const;
-  vector<Real> solve_linear ()const;
+  std::vector<Real> solve_quadric ()const;
+  std::vector<Real> solve_cubic ()const;
+  std::vector<Real> solve_linear ()const;
 
-  vector<Real> solve () const;
+  std::vector<Real> solve () const;
 };
 
 IMPLEMENT_ARITHMETIC_OPERATOR (Polynomial, -);