Fix table namespace conflicts.

Author: evoskuil

include/bitcoin/database/tables/archives/input.hpp

@@ -105,7 +105,7 @@ struct input
             static constexpr auto sequence_point_size = sizeof(uint32_t) +
                 chain::point::serialized_size();
 
-            const auto& ins = *tx.inputs_ptr();
+            const auto& ins = *tx_.inputs_ptr();
             const auto other = ins.size() * sequence_point_size;
             const auto inputs = std::accumulate(ins.begin(), ins.end(), zero,
                 [](size_t total, const auto& in) NOEXCEPT
@@ -120,7 +120,7 @@ struct input
 
         inline bool to_data(flipper& sink) const NOEXCEPT
         {
-            const auto& ins = *tx.inputs_ptr();
+            const auto& ins = *tx_.inputs_ptr();
             std::for_each(ins.begin(), ins.end(), [&](const auto& in) NOEXCEPT
             {
                 in->script().to_data(sink, true);
@@ -131,7 +131,7 @@ struct input
             return sink;
         }
 
-        const system::chain::transaction& tx{};
+        const system::chain::transaction& tx_{};
     };
 };
 

include/bitcoin/database/tables/archives/ins.hpp

@@ -103,7 +103,7 @@ struct ins
     {
         link count() const NOEXCEPT
         {
-            return system::possible_narrow_cast<link::integer>(tx.inputs());
+            return system::possible_narrow_cast<link::integer>(tx_.inputs());
         }
 
         inline bool to_data(flipper& sink) const NOEXCEPT
@@ -113,7 +113,7 @@ struct ins
                 chain::point::serialized_size();
 
             auto in_fk = input_fk;
-            const auto& ins = *tx.inputs_ptr();
+            const auto& ins = *tx_.inputs_ptr();
             std::for_each(ins.begin(), ins.end(), [&](const auto& in) NOEXCEPT
             {
                 sink.write_little_endian<uint32_t>(in->sequence());
@@ -131,7 +131,7 @@ struct ins
 
         const in::integer input_fk{};
         const tx::integer parent_fk{};
-        const system::chain::transaction& tx{};
+        const system::chain::transaction& tx_{};
     };
 };
 

include/bitcoin/database/tables/archives/output.hpp

@@ -155,7 +155,7 @@ struct output
             static constexpr auto value_parent_difference = sizeof(uint64_t) -
                 tx::size;
 
-            const auto& outs = *tx.outputs_ptr();
+            const auto& outs = *tx_.outputs_ptr();
             const auto other = outs.size() * value_parent_difference;
             const auto outputs = std::accumulate(outs.begin(), outs.end(), zero,
                 [](size_t total, const auto& out) NOEXCEPT
@@ -172,7 +172,7 @@ struct output
 
         inline bool to_data(flipper& sink) const NOEXCEPT
         {
-            const auto& outs = *tx.outputs_ptr();
+            const auto& outs = *tx_.outputs_ptr();
             std::for_each(outs.begin(), outs.end(), [&](const auto& out) NOEXCEPT
             {
                 sink.write_little_endian<tx::integer, tx::size>(parent_fk);
@@ -185,7 +185,7 @@ struct output
         }
 
         const tx::integer parent_fk{};
-        const system::chain::transaction& tx{};
+        const system::chain::transaction& tx_{};
     };
 };
 

include/bitcoin/database/tables/archives/outs.hpp

@@ -99,7 +99,7 @@ struct outs
     {
         link count() const NOEXCEPT
         {
-            return system::possible_narrow_cast<link::integer>(tx.outputs());
+            return system::possible_narrow_cast<link::integer>(tx_.outputs());
         }
 
         inline bool to_data(flipper& sink) const NOEXCEPT
@@ -110,7 +110,7 @@ struct outs
                 tx::size;
 
             auto out_fk = output_fk;
-            const auto& outs = *tx.outputs_ptr();
+            const auto& outs = *tx_.outputs_ptr();
             std::for_each(outs.begin(), outs.end(), [&](const auto& out) NOEXCEPT
             {
                 sink.write_little_endian<out::integer, out::size>(out_fk);
@@ -126,7 +126,7 @@ struct outs
         }
 
         const out::integer output_fk{};
-        const system::chain::transaction& tx{};
+        const system::chain::transaction& tx_{};
     };
 };