[lmi-commits] [5295] Make str() virtual

[Greg Chicares]

Revision: 5295
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5295
Author:   chicares
Date:     2011-10-08 10:26:40 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Make str() virtual

Modified Paths:
--------------
    lmi/trunk/tn_range.hpp
    lmi/trunk/tn_range.tpp
    lmi/trunk/tn_range_test.cpp

Modified: lmi/trunk/tn_range.hpp
===================================================================
--- lmi/trunk/tn_range.hpp      2011-10-08 10:02:27 UTC (rev 5294)
+++ lmi/trunk/tn_range.hpp      2011-10-08 10:26:40 UTC (rev 5295)
@@ -147,6 +147,7 @@
     virtual std::string diagnose_invalidity(std::string const&) const = 0;
     virtual void enforce_circumscription() = 0;
     virtual bool equal_to(std::string const&) const = 0;
+    virtual std::string str() const = 0;
     virtual double universal_minimum() const = 0;
     virtual double universal_maximum() const = 0;
 };
@@ -280,7 +281,6 @@
     Number curb(Number) const;
     std::string format_limits_for_error_message() const;
     bool is_valid(Number) const;
-    std::string str() const;
 
     // datum_base required implementation.
     virtual std::istream& read (std::istream&);
@@ -290,6 +290,7 @@
     virtual std::string diagnose_invalidity(std::string const&) const;
     virtual void enforce_circumscription();
     virtual bool equal_to(std::string const&) const;
+    virtual std::string str() const;
     virtual double universal_minimum() const;
     virtual double universal_maximum() const;
 

Modified: lmi/trunk/tn_range.tpp
===================================================================
--- lmi/trunk/tn_range.tpp      2011-10-08 10:02:27 UTC (rev 5294)
+++ lmi/trunk/tn_range.tpp      2011-10-08 10:26:40 UTC (rev 5295)
@@ -644,12 +644,6 @@
 }
 
 template<typename Number, typename Trammel>
-std::string tn_range<Number,Trammel>::str() const
-{
-    return value_cast<std::string>(value_);
-}
-
-template<typename Number, typename Trammel>
 std::istream& tn_range<Number,Trammel>::read(std::istream& is)
 {
     std::string s;
@@ -734,6 +728,12 @@
 }
 
 template<typename Number, typename Trammel>
+std::string tn_range<Number,Trammel>::str() const
+{
+    return value_cast<std::string>(value_);
+}
+
+template<typename Number, typename Trammel>
 double tn_range<Number,Trammel>::universal_minimum() const
 {
     return value_cast<double>(minimum_);

Modified: lmi/trunk/tn_range_test.cpp
===================================================================
--- lmi/trunk/tn_range_test.cpp 2011-10-08 10:02:27 UTC (rev 5294)
+++ lmi/trunk/tn_range_test.cpp 2011-10-08 10:26:40 UTC (rev 5295)
@@ -393,10 +393,9 @@
     // *** Explicit conversions.
 
     // Explicit conversion to std::string.
-    // Not tested because it's private.
-//    BOOST_TEST_EQUAL(range1.str(), "3.14159");
+    BOOST_TEST_EQUAL(range1.str(), "3.14159");
 
-    // Explicit conversion to enumerator.
+    // Explicit conversion to number.
     BOOST_TEST_EQUAL(range1.value(), 3.14159);
 
     // *** Limits.