lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [4886] Rename 'ihs_funddata.?pp' to 'fund_data.?pp'


From: Greg Chicares
Subject: [lmi-commits] [4886] Rename 'ihs_funddata.?pp' to 'fund_data.?pp'
Date: Sat, 01 May 2010 16:31:43 +0000

Revision: 4886
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4886
Author:   chicares
Date:     2010-05-01 16:31:42 +0000 (Sat, 01 May 2010)
Log Message:
-----------
Rename 'ihs_funddata.?pp' to 'fund_data.?pp'

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/Makefile.am
    lmi/trunk/generate_product_files.cpp
    lmi/trunk/ihs_basicval.cpp
    lmi/trunk/ledger_invariant.cpp
    lmi/trunk/my_fund.cpp
    lmi/trunk/objects.make
    lmi/trunk/product_file_test.cpp

Added Paths:
-----------
    lmi/trunk/fund_data.cpp
    lmi/trunk/fund_data.hpp

Removed Paths:
-------------
    lmi/trunk/ihs_funddata.cpp
    lmi/trunk/ihs_funddata.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-05-01 15:57:41 UTC (rev 4885)
+++ lmi/trunk/ChangeLog 2010-05-01 16:31:42 UTC (rev 4886)
@@ -25252,3 +25252,27 @@
   objects.make
 Merge two TUs, as if by renaming 'ihs_dbvalue.cpp' to 'dbvalue.cpp'.
 
+20100501T1557Z <address@hidden> [732]
+
+  Makefile.am
+  commutation_functions_test.cpp
+  ihs_commfns.cpp [renamed to commutation_functions.cpp]
+  ihs_commfns.hpp [renamed to commutation_functions.hpp]
+  ihs_irc7702.cpp
+  mec_server.cpp
+  objects.make
+Rename 'ihs_commfns.?pp' to 'commutation_functions.?pp'.
+
+20100501T1631Z <address@hidden> [732]
+
+  Makefile.am
+  generate_product_files.cpp
+  ihs_basicval.cpp
+  ihs_funddata.cpp [renamed to fund_data.cpp]
+  ihs_funddata.hpp [renamed to fund_data.hpp]
+  ledger_invariant.cpp
+  my_fund.cpp
+  objects.make
+  product_file_test.cpp
+Rename 'ihs_funddata.?pp' to 'fund_data.?pp'.
+

Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am       2010-05-01 15:57:41 UTC (rev 4885)
+++ lmi/trunk/Makefile.am       2010-05-01 16:31:42 UTC (rev 4886)
@@ -320,6 +320,7 @@
     datum_base.cpp \
     datum_boolean.cpp \
     datum_string.cpp \
+    fund_data.cpp \
     ihs_acctval.cpp \
     ihs_avdebug.cpp \
     ihs_avmly.cpp \
@@ -328,7 +329,6 @@
     ihs_basicval.cpp \
     ihs_database.cpp \
     ihs_dbdict.cpp \
-    ihs_funddata.cpp \
     ihs_irc7702.cpp \
     ihs_irc7702a.cpp \
     ihs_mortal.cpp \
@@ -727,9 +727,9 @@
   dbnames.cpp \
   dbvalue.cpp \
   expm1.cpp \
+  fund_data.cpp \
   global_settings.cpp \
   ihs_dbdict.cpp \
-  ihs_funddata.cpp \
   miscellany.cpp \
   path_utility.cpp \
   product_data.cpp \
@@ -904,13 +904,13 @@
     fenv_lmi_x86.hpp \
     file_command.hpp \
     financial.hpp \
+    fund_data.hpp \
     getopt.hpp \
     global_settings.hpp \
     group_values.hpp \
     handle_exceptions.hpp \
     icon_monger.hpp \
     ihs_dbdict.hpp \
-    ihs_funddata.hpp \
     ihs_irc7702a.hpp \
     ihs_irc7702.hpp \
     ihs_server7702.hpp \

Copied: lmi/trunk/fund_data.cpp (from rev 4845, lmi/trunk/ihs_funddata.cpp)
===================================================================
--- lmi/trunk/fund_data.cpp                             (rev 0)
+++ lmi/trunk/fund_data.cpp     2010-05-01 16:31:42 UTC (rev 4886)
@@ -0,0 +1,171 @@
+// Fund names and investment-management fees.
+//
+// Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 
2010 Gregory W. Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+// $Id$
+
+#ifdef __BORLANDC__
+#   include "pchfile.hpp"
+#   pragma hdrstop
+#endif // __BORLANDC__
+
+#include "fund_data.hpp"
+
+#include "alert.hpp"
+#include "assert_lmi.hpp"
+#include "data_directory.hpp"
+#include "platform_dependent.hpp" // access()
+#include "xml_lmi.hpp"
+#include "xml_serialize.hpp"
+
+#include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem/path.hpp>
+
+//============================================================================
+FundInfo::FundInfo()
+    :ScalarIMF_(0.0)
+    ,ShortName_("")
+    ,LongName_ ("")
+    ,gloss_    ("")
+{
+}
+
+//============================================================================
+FundInfo::FundInfo
+    (double             ScalarIMF
+    ,std::string const& ShortName
+    ,std::string const& LongName
+    ,std::string const& gloss
+    )
+    :ScalarIMF_(ScalarIMF)
+    ,ShortName_(ShortName)
+    ,LongName_ (LongName)
+    ,gloss_    (gloss)
+{
+}
+
+//============================================================================
+FundInfo::~FundInfo()
+{
+}
+
+namespace xml_serialize
+{
+template<> struct xml_io<FundInfo>
+{
+    static void to_xml(xml::element& e, FundInfo const& t)
+    {
+        set_element(e, "scalar_imf", t.ScalarIMF());
+        set_element(e, "short_name", t.ShortName());
+        set_element(e, "long_name" , t.LongName ());
+        set_element(e, "gloss"     , t.gloss    ());
+    }
+
+    static void from_xml(xml::element const& e, FundInfo& t)
+    {
+        double      scalar_imf;
+        std::string short_name;
+        std::string long_name;
+        std::string gloss;
+        get_element(e, "scalar_imf", scalar_imf);
+        get_element(e, "short_name", short_name);
+        get_element(e, "long_name" , long_name );
+        get_element(e, "gloss"     , gloss     );
+        t = FundInfo(scalar_imf, short_name, long_name, gloss);
+    }
+};
+} // namespace xml_serialize
+
+//============================================================================
+FundData::FundData()
+{
+}
+
+//============================================================================
+FundData::FundData(std::string const& a_Filename)
+{
+    Read(a_Filename);
+}
+
+//============================================================================
+FundData::~FundData()
+{
+}
+
+namespace
+{
+std::string xml_root_name()
+{
+    return "funds";
+}
+} // Unnamed namespace.
+
+//============================================================================
+void FundData::Read(std::string const& a_Filename)
+{
+    if(access(a_Filename.c_str(), R_OK))
+        {
+        fatal_error()
+            << "File '"
+            << a_Filename
+            << "' is required but could not be found. Try reinstalling."
+            << LMI_FLUSH
+            ;
+        }
+
+    xml_lmi::dom_parser parser(a_Filename);
+    xml::element const& root = parser.root_node(xml_root_name());
+
+    xml_serialize::from_xml(root, FundInfo_);
+}
+
+//============================================================================
+void FundData::Write(std::string const& a_Filename) const
+{
+    xml_lmi::xml_document document(xml_root_name());
+    xml::element& root = document.root_node();
+
+    xml_lmi::set_attr(root, "version", "0");
+    xml_serialize::to_xml(root, FundInfo_);
+
+    // Instead of this:
+//    document.save(a_Filename);
+    // for the nonce, explicitly change the extension, in order to
+    // force external product-file code to use the new extension.
+    fs::path path(a_Filename, fs::native);
+    path = fs::change_extension(path, ".funds");
+    document.save(path.string());
+}
+
+//============================================================================
+void FundData::WriteFundFiles()
+{
+    FundData foo;
+    foo.FundInfo_.push_back
+        (FundInfo
+            (50
+            ,"Money Market"
+            ,"Money Market Fund"
+            ,"Specimen gloss."
+            )
+        );
+    foo.Write(AddDataDir("sample.funds"));
+}
+

Copied: lmi/trunk/fund_data.hpp (from rev 4845, lmi/trunk/ihs_funddata.hpp)
===================================================================
--- lmi/trunk/fund_data.hpp                             (rev 0)
+++ lmi/trunk/fund_data.hpp     2010-05-01 16:31:42 UTC (rev 4886)
@@ -0,0 +1,122 @@
+// Fund names and investment-management fees.
+//
+// Copyright (C) 1998, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 
Gregory W. Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+// $Id$
+
+#ifndef fund_data_hpp
+#define fund_data_hpp
+
+#include "config.hpp"
+
+#include "obstruct_slicing.hpp"
+#include "so_attributes.hpp"
+
+#include <boost/utility.hpp>
+
+#include <string>
+#include <vector>
+
+// Separate account funds: their names and investment mgmt fees
+
+// Implicitly-declared special member functions do the right thing.
+
+class LMI_SO FundInfo
+    :virtual private obstruct_slicing<FundInfo>
+{
+    friend class FundData;
+
+  public:
+    FundInfo();
+    FundInfo
+        (double             ScalarIMF
+        ,std::string const& ShortName
+        ,std::string const& LongName
+        ,std::string const& gloss = std::string()
+        );
+    ~FundInfo();
+
+    double ScalarIMF() const;
+    std::string const& ShortName() const;
+    std::string const& LongName() const;
+    std::string const& gloss() const;
+
+  private:
+    double ScalarIMF_;
+    std::string ShortName_;
+    std::string LongName_;
+    std::string gloss_;
+};
+
+class LMI_SO FundData
+    :private boost::noncopyable
+    ,virtual private obstruct_slicing<FundData>
+{
+  public:
+    FundData(std::string const& a_Filename);
+    ~FundData();
+
+    static void WriteFundFiles();
+    static void WriteProprietaryFundFiles();
+
+    FundInfo const& GetFundInfo(int j) const;
+    int GetNumberOfFunds() const;
+
+  private:
+    FundData(); // Private, but implemented.
+
+    void Read (std::string const& a_Filename);
+    void Write(std::string const& a_Filename) const;
+
+    std::vector<FundInfo> FundInfo_;
+};
+
+inline double FundInfo::ScalarIMF() const
+{
+    return ScalarIMF_;
+}
+
+inline std::string const& FundInfo::ShortName() const
+{
+    return ShortName_;
+}
+
+inline std::string const& FundInfo::LongName() const
+{
+    return LongName_;
+}
+
+inline std::string const& FundInfo::gloss() const
+{
+    return gloss_;
+}
+
+inline FundInfo const& FundData::GetFundInfo(int j) const
+{
+    return FundInfo_[j];
+}
+
+inline int FundData::GetNumberOfFunds() const
+{
+    return FundInfo_.size();
+}
+
+#endif // fund_data_hpp
+

Modified: lmi/trunk/generate_product_files.cpp
===================================================================
--- lmi/trunk/generate_product_files.cpp        2010-05-01 15:57:41 UTC (rev 
4885)
+++ lmi/trunk/generate_product_files.cpp        2010-05-01 16:31:42 UTC (rev 
4886)
@@ -26,8 +26,8 @@
 #   pragma hdrstop
 #endif // __BORLANDC__
 
+#include "fund_data.hpp"
 #include "ihs_dbdict.hpp"
-#include "ihs_funddata.hpp"
 #include "main_common.hpp"
 #include "path_utility.hpp" // initialize_filesystem()
 #include "product_data.hpp"

Modified: lmi/trunk/ihs_basicval.cpp
===================================================================
--- lmi/trunk/ihs_basicval.cpp  2010-05-01 15:57:41 UTC (rev 4885)
+++ lmi/trunk/ihs_basicval.cpp  2010-05-01 16:31:42 UTC (rev 4886)
@@ -38,9 +38,9 @@
 #include "dbnames.hpp"
 #include "death_benefits.hpp"
 #include "et_vector.hpp"
+#include "fund_data.hpp"
 #include "global_settings.hpp"
 #include "ihs_dbdict.hpp"
-#include "ihs_funddata.hpp"
 #include "ihs_irc7702.hpp"
 #include "ihs_irc7702a.hpp"
 #include "ihs_x_type.hpp"

Deleted: lmi/trunk/ihs_funddata.cpp
===================================================================
--- lmi/trunk/ihs_funddata.cpp  2010-05-01 15:57:41 UTC (rev 4885)
+++ lmi/trunk/ihs_funddata.cpp  2010-05-01 16:31:42 UTC (rev 4886)
@@ -1,171 +0,0 @@
-// Fund names and investment-management fees.
-//
-// Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 
2010 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-#ifdef __BORLANDC__
-#   include "pchfile.hpp"
-#   pragma hdrstop
-#endif // __BORLANDC__
-
-#include "ihs_funddata.hpp"
-
-#include "alert.hpp"
-#include "assert_lmi.hpp"
-#include "data_directory.hpp"
-#include "platform_dependent.hpp" // access()
-#include "xml_lmi.hpp"
-#include "xml_serialize.hpp"
-
-#include <boost/filesystem/convenience.hpp>
-#include <boost/filesystem/path.hpp>
-
-//============================================================================
-FundInfo::FundInfo()
-    :ScalarIMF_(0.0)
-    ,ShortName_("")
-    ,LongName_ ("")
-    ,gloss_    ("")
-{
-}
-
-//============================================================================
-FundInfo::FundInfo
-    (double             ScalarIMF
-    ,std::string const& ShortName
-    ,std::string const& LongName
-    ,std::string const& gloss
-    )
-    :ScalarIMF_(ScalarIMF)
-    ,ShortName_(ShortName)
-    ,LongName_ (LongName)
-    ,gloss_    (gloss)
-{
-}
-
-//============================================================================
-FundInfo::~FundInfo()
-{
-}
-
-namespace xml_serialize
-{
-template<> struct xml_io<FundInfo>
-{
-    static void to_xml(xml::element& e, FundInfo const& t)
-    {
-        set_element(e, "scalar_imf", t.ScalarIMF());
-        set_element(e, "short_name", t.ShortName());
-        set_element(e, "long_name" , t.LongName ());
-        set_element(e, "gloss"     , t.gloss    ());
-    }
-
-    static void from_xml(xml::element const& e, FundInfo& t)
-    {
-        double      scalar_imf;
-        std::string short_name;
-        std::string long_name;
-        std::string gloss;
-        get_element(e, "scalar_imf", scalar_imf);
-        get_element(e, "short_name", short_name);
-        get_element(e, "long_name" , long_name );
-        get_element(e, "gloss"     , gloss     );
-        t = FundInfo(scalar_imf, short_name, long_name, gloss);
-    }
-};
-} // namespace xml_serialize
-
-//============================================================================
-FundData::FundData()
-{
-}
-
-//============================================================================
-FundData::FundData(std::string const& a_Filename)
-{
-    Read(a_Filename);
-}
-
-//============================================================================
-FundData::~FundData()
-{
-}
-
-namespace
-{
-std::string xml_root_name()
-{
-    return "funds";
-}
-} // Unnamed namespace.
-
-//============================================================================
-void FundData::Read(std::string const& a_Filename)
-{
-    if(access(a_Filename.c_str(), R_OK))
-        {
-        fatal_error()
-            << "File '"
-            << a_Filename
-            << "' is required but could not be found. Try reinstalling."
-            << LMI_FLUSH
-            ;
-        }
-
-    xml_lmi::dom_parser parser(a_Filename);
-    xml::element const& root = parser.root_node(xml_root_name());
-
-    xml_serialize::from_xml(root, FundInfo_);
-}
-
-//============================================================================
-void FundData::Write(std::string const& a_Filename) const
-{
-    xml_lmi::xml_document document(xml_root_name());
-    xml::element& root = document.root_node();
-
-    xml_lmi::set_attr(root, "version", "0");
-    xml_serialize::to_xml(root, FundInfo_);
-
-    // Instead of this:
-//    document.save(a_Filename);
-    // for the nonce, explicitly change the extension, in order to
-    // force external product-file code to use the new extension.
-    fs::path path(a_Filename, fs::native);
-    path = fs::change_extension(path, ".funds");
-    document.save(path.string());
-}
-
-//============================================================================
-void FundData::WriteFundFiles()
-{
-    FundData foo;
-    foo.FundInfo_.push_back
-        (FundInfo
-            (50
-            ,"Money Market"
-            ,"Money Market Fund"
-            ,"Specimen gloss."
-            )
-        );
-    foo.Write(AddDataDir("sample.funds"));
-}
-

Deleted: lmi/trunk/ihs_funddata.hpp
===================================================================
--- lmi/trunk/ihs_funddata.hpp  2010-05-01 15:57:41 UTC (rev 4885)
+++ lmi/trunk/ihs_funddata.hpp  2010-05-01 16:31:42 UTC (rev 4886)
@@ -1,122 +0,0 @@
-// Fund names and investment-management fees.
-//
-// Copyright (C) 1998, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 
Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-#ifndef ihs_funddata_hpp
-#define ihs_funddata_hpp
-
-#include "config.hpp"
-
-#include "obstruct_slicing.hpp"
-#include "so_attributes.hpp"
-
-#include <boost/utility.hpp>
-
-#include <string>
-#include <vector>
-
-// Separate account funds: their names and investment mgmt fees
-
-// Implicitly-declared special member functions do the right thing.
-
-class LMI_SO FundInfo
-    :virtual private obstruct_slicing<FundInfo>
-{
-    friend class FundData;
-
-  public:
-    FundInfo();
-    FundInfo
-        (double             ScalarIMF
-        ,std::string const& ShortName
-        ,std::string const& LongName
-        ,std::string const& gloss = std::string()
-        );
-    ~FundInfo();
-
-    double ScalarIMF() const;
-    std::string const& ShortName() const;
-    std::string const& LongName() const;
-    std::string const& gloss() const;
-
-  private:
-    double ScalarIMF_;
-    std::string ShortName_;
-    std::string LongName_;
-    std::string gloss_;
-};
-
-class LMI_SO FundData
-    :private boost::noncopyable
-    ,virtual private obstruct_slicing<FundData>
-{
-  public:
-    FundData(std::string const& a_Filename);
-    ~FundData();
-
-    static void WriteFundFiles();
-    static void WriteProprietaryFundFiles();
-
-    FundInfo const& GetFundInfo(int j) const;
-    int GetNumberOfFunds() const;
-
-  private:
-    FundData(); // Private, but implemented.
-
-    void Read (std::string const& a_Filename);
-    void Write(std::string const& a_Filename) const;
-
-    std::vector<FundInfo> FundInfo_;
-};
-
-inline double FundInfo::ScalarIMF() const
-{
-    return ScalarIMF_;
-}
-
-inline std::string const& FundInfo::ShortName() const
-{
-    return ShortName_;
-}
-
-inline std::string const& FundInfo::LongName() const
-{
-    return LongName_;
-}
-
-inline std::string const& FundInfo::gloss() const
-{
-    return gloss_;
-}
-
-inline FundInfo const& FundData::GetFundInfo(int j) const
-{
-    return FundInfo_[j];
-}
-
-inline int FundData::GetNumberOfFunds() const
-{
-    return FundInfo_.size();
-}
-
-#endif // ihs_funddata_hpp
-

Modified: lmi/trunk/ledger_invariant.cpp
===================================================================
--- lmi/trunk/ledger_invariant.cpp      2010-05-01 15:57:41 UTC (rev 4885)
+++ lmi/trunk/ledger_invariant.cpp      2010-05-01 16:31:42 UTC (rev 4886)
@@ -36,7 +36,7 @@
 #include "dbnames.hpp"
 #include "death_benefits.hpp"
 #include "financial.hpp"  // TODO ?? For IRRs--prolly don't blong here.
-#include "ihs_funddata.hpp"
+#include "fund_data.hpp"
 #include "input.hpp"
 #include "interest_rates.hpp"
 #include "ledger.hpp" // TODO ?? For IRRs--prolly don't blong here.

Modified: lmi/trunk/my_fund.cpp
===================================================================
--- lmi/trunk/my_fund.cpp       2010-05-01 15:57:41 UTC (rev 4885)
+++ lmi/trunk/my_fund.cpp       2010-05-01 16:31:42 UTC (rev 4886)
@@ -39,7 +39,7 @@
 #   pragma hdrstop
 #endif // __BORLANDC__
 
-#include "ihs_funddata.hpp"
+#include "fund_data.hpp"
 
 #include "data_directory.hpp" // AddDataDir()
 

Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make      2010-05-01 15:57:41 UTC (rev 4885)
+++ lmi/trunk/objects.make      2010-05-01 16:31:42 UTC (rev 4886)
@@ -267,6 +267,7 @@
   $(common_common_objects) \
   authenticity.o \
   commutation_functions.o \
+  fund_data.o \
   ihs_acctval.o \
   ihs_avdebug.o \
   ihs_avmly.o \
@@ -275,7 +276,6 @@
   ihs_basicval.o \
   ihs_database.o \
   ihs_dbdict.o \
-  ihs_funddata.o \
   ihs_irc7702.o \
   ihs_irc7702a.o \
   ihs_mortal.o \
@@ -382,11 +382,11 @@
   expm1.o \
   facets.o \
   fenv_lmi.o \
+  fund_data.o \
   global_settings.o \
   ihs_basicval.o \
   ihs_database.o \
   ihs_dbdict.o \
-  ihs_funddata.o \
   ihs_mortal.o \
   input.o \
   input_harmonization.o \
@@ -774,9 +774,9 @@
   dbvalue.o \
   expm1.o \
   facets.o \
+  fund_data.o \
   global_settings.o \
   ihs_dbdict.o \
-  ihs_funddata.o \
   mc_enum.o \
   mc_enum_types.o \
   miscellany.o \

Modified: lmi/trunk/product_file_test.cpp
===================================================================
--- lmi/trunk/product_file_test.cpp     2010-05-01 15:57:41 UTC (rev 4885)
+++ lmi/trunk/product_file_test.cpp     2010-05-01 16:31:42 UTC (rev 4886)
@@ -26,8 +26,8 @@
 #   pragma hdrstop
 #endif // __BORLANDC__
 
+#include "fund_data.hpp"
 #include "ihs_dbdict.hpp"
-#include "ihs_funddata.hpp"
 #include "path_utility.hpp" // initialize_filesystem()
 #include "product_data.hpp"
 #include "rounding_rules.hpp"





reply via email to

[Prev in Thread] Current Thread [Next in Thread]