[lmi-commits] [lmi] master eab1f68 3/4: Use different typedef-names in certain alias-declarations

[Greg Chicares]

branch: master
commit eab1f68c025a00c31e3f8b75f63d065a3cae09b4
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Use different typedef-names in certain alias-declarations
    
    Elsewhere, 'all_vectors' nominates a function that returns a map of a
    different type.
---
 ledger_evaluator.hpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ledger_evaluator.hpp b/ledger_evaluator.hpp
index d5ef54b..3f0d612 100644
--- a/ledger_evaluator.hpp
+++ b/ledger_evaluator.hpp
@@ -38,23 +38,24 @@ class LMI_SO ledger_evaluator
 {
     friend class Ledger;
 
+    template<typename K, typename T> using umap = std::unordered_map<K,T>;
+    using scalar_map_t = umap<std::string,            std::string >;
+    using vector_map_t = umap<std::string,std::vector<std::string>>;
+
   public:
     std::string operator()(std::string const& scalar) const;
     std::string operator()(std::string const& vector, std::size_t index) const;
 
   private:
-    using all_scalars = std::unordered_map<std::string,            std::string 
>;
-    using all_vectors = 
std::unordered_map<std::string,std::vector<std::string>>;
-
-    // Objects of this class can only be created by Ledger::make_evaluator().
-    ledger_evaluator(all_scalars&& scalars, all_vectors&& vectors)
+    // Constructible only by friends: see Ledger::make_evaluator().
+    ledger_evaluator(scalar_map_t&& scalars, vector_map_t&& vectors)
         :scalars_ {scalars}
         ,vectors_ {vectors}
     {
     }
 
-    all_scalars const scalars_;
-    all_vectors const vectors_;
+    scalar_map_t const scalars_;
+    vector_map_t const vectors_;
 };
 
 #endif // ledger_evaluator_hpp