[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [4905] Remove gratuitous dissimilarities
From: |
Greg Chicares |
Subject: |
[lmi-commits] [4905] Remove gratuitous dissimilarities |
Date: |
Wed, 05 May 2010 17:20:43 +0000 |
Revision: 4905
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4905
Author: chicares
Date: 2010-05-05 17:20:41 +0000 (Wed, 05 May 2010)
Log Message:
-----------
Remove gratuitous dissimilarities
Modified Paths:
--------------
lmi/trunk/database.cpp
lmi/trunk/ihs_database.cpp
Modified: lmi/trunk/database.cpp
===================================================================
--- lmi/trunk/database.cpp 2010-05-05 16:12:33 UTC (rev 4904)
+++ lmi/trunk/database.cpp 2010-05-05 17:20:41 UTC (rev 4905)
@@ -33,9 +33,8 @@
#include "dbnames.hpp"
#include "yare_input.hpp"
-#include <algorithm> // std::min()
-#include <iterator>
-#include <ostream>
+#include <algorithm> // std::copy(), std::min()
+#include <iterator> // ostream_iterator
//============================================================================
product_database::product_database
@@ -47,14 +46,14 @@
,mcenum_uw_basis a_UWBasis
,mcenum_state a_State
)
- :Filename (a_ProductName)
- ,length_ (0)
- ,Gender (a_Gender)
- ,Class (a_Class)
- ,Smoker (a_Smoker)
- ,IssueAge (a_IssueAge)
- ,UWBasis (a_UWBasis)
- ,State (a_State)
+ :Filename (a_ProductName)
+ ,length_ (0)
+ ,Gender (a_Gender)
+ ,Class (a_Class)
+ ,Smoker (a_Smoker)
+ ,IssueAge (a_IssueAge)
+ ,UWBasis (a_UWBasis)
+ ,State (a_State)
{
// DBDictionary::instance().Init(Filename);
DBDictionary::instance().InitAntediluvian();
@@ -137,7 +136,6 @@
{
dict_map const& d = DBDictionary::instance().GetDictionary();
dict_map::const_iterator i = d.find(k);
-
if(i == d.end())
{
fatal_error()
Modified: lmi/trunk/ihs_database.cpp
===================================================================
--- lmi/trunk/ihs_database.cpp 2010-05-05 16:12:33 UTC (rev 4904)
+++ lmi/trunk/ihs_database.cpp 2010-05-05 17:20:41 UTC (rev 4905)
@@ -41,7 +41,8 @@
#include "product_data.hpp"
#include "yare_input.hpp"
-#include <algorithm>
+#include <algorithm> // std::copy(), std::max(), std::min()
+#include <iterator> // ostream_iterator
//============================================================================
product_database::product_database
@@ -214,9 +215,9 @@
//===========================================================================
database_entity const& product_database::GetEntry(int k) const
{
- dict_map const& dict = DBDictionary::instance().GetDictionary();
- dict_map::const_iterator p = dict.find(k);
- if(p == dict.end())
+ dict_map const& d = DBDictionary::instance().GetDictionary();
+ dict_map::const_iterator i = d.find(k);
+ if(i == d.end())
{
std::string s("no name");
if(0 <= k && static_cast<unsigned int>(k) < GetDBNames().size())
@@ -234,7 +235,7 @@
}
else
{
- return (*p).second;
+ return (*i).second;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [4905] Remove gratuitous dissimilarities,
Greg Chicares <=