From: Diane Trout <diane@caltech.edu>
Date: Fri, 29 Jun 2007 21:44:01 +0000 (+0000)
Subject: Use the right return type
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=commitdiff_plain;h=39dfd715c7976fddf17a0859f071d44c8fa3f52e

Use the right return type
Makes a type conversion warning go away.
---

diff --git a/alg/glsequence.cpp b/alg/glsequence.cpp
index 9f861bb..708a53a 100644
--- a/alg/glsequence.cpp
+++ b/alg/glsequence.cpp
@@ -184,7 +184,7 @@ GLfloat GlSequence::right() const
   return size()+x();
 }
 
-GLfloat GlSequence::size() const
+Sequence::size_type GlSequence::size() const
 {
   return Sequence::size();
 }
diff --git a/alg/glsequence.hpp b/alg/glsequence.hpp
index a2b5704..8243640 100644
--- a/alg/glsequence.hpp
+++ b/alg/glsequence.hpp
@@ -86,7 +86,7 @@ public:
   //! get our right (horizontal) coordinate (size-x)
   float right() const;
   //! how long is our sequence track? (computed from the sequence)
-  GLfloat size() const;
+  Sequence::size_type size() const;
  
   //! return the left (lowest) base index that is fully visible
   Sequence::size_type leftbase(GLfloat left) const;