[lmi-commits] [4940] Replace a static member with a free function

[Greg Chicares]

Revision: 4940
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4940
Author:   chicares
Date:     2010-05-10 01:35:17 +0000 (Mon, 10 May 2010)
Log Message:
-----------
Replace a static member with a free function

Modified Paths:
--------------
    lmi/trunk/database_view_editor.cpp
    lmi/trunk/dbvalue.cpp
    lmi/trunk/dbvalue.hpp

Modified: lmi/trunk/database_view_editor.cpp
===================================================================
--- lmi/trunk/database_view_editor.cpp  2010-05-10 01:17:14 UTC (rev 4939)
+++ lmi/trunk/database_view_editor.cpp  2010-05-10 01:35:17 UTC (rev 4940)
@@ -211,7 +211,7 @@
 
     std::vector<int> axis_lengths = db_value_->GetAxisLengths();
 
-    axis_lengths[n] = varies ? database_entity::maximum_dimensions()[n] : 1;
+    axis_lengths[n] = varies ? maximum_database_dimensions()[n] : 1;
 
     ReshapeTableData(axis_lengths, varies);
 }

Modified: lmi/trunk/dbvalue.cpp
===================================================================
--- lmi/trunk/dbvalue.cpp       2010-05-10 01:17:14 UTC (rev 4939)
+++ lmi/trunk/dbvalue.cpp       2010-05-10 01:35:17 UTC (rev 4940)
@@ -389,7 +389,7 @@
     LMI_ASSERT(DB_FIRST <= key_ && key_ < DB_LAST);
     LMI_ASSERT(e_number_of_axes == axis_lengths_.size());
 
-    std::vector<int> const& max_dims(maximum_dimensions());
+    std::vector<int> const& max_dims(maximum_database_dimensions());
     LMI_ASSERT(e_number_of_axes == max_dims.size());
     std::vector<int>::const_iterator ai = axis_lengths_.begin();
     std::vector<int>::const_iterator mi = max_dims.begin();
@@ -493,7 +493,7 @@
     xml_serialize::set_element(e, "gloss"       , gloss_       );
 }
 
-std::vector<int> const& database_entity::maximum_dimensions()
+std::vector<int> const& maximum_database_dimensions()
 {
     static int const d[e_number_of_axes] =
         {e_max_dim_gender

Modified: lmi/trunk/dbvalue.hpp
===================================================================
--- lmi/trunk/dbvalue.hpp       2010-05-10 01:17:14 UTC (rev 4939)
+++ lmi/trunk/dbvalue.hpp       2010-05-10 01:35:17 UTC (rev 4940)
@@ -134,11 +134,10 @@
     std::vector<int>    axis_lengths_;
     std::vector<double> data_values_;
     std::string         gloss_;
-
-  public: // for the nonce...
-    static std::vector<int> const& maximum_dimensions();
 };
 
+std::vector<int> const& maximum_database_dimensions();
+
 /*
 Some data are scalar by nature--for example, maturity age (DB_EndtAge).
 Someday we might add a flag here to express that constraint; until then,