fixed rename

donovan68 · Sep 6, 2019 · 2847155 · 2847155
1 parent 03ca4af
commit 2847155
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/include/pipes2/detail/core/Node.hpp b/include/pipes2/detail/core/Node.hpp
@@ -19,12 +19,12 @@ namespace tillh::pipes2
 
     template<class Connections_, class PrimaryConnection_, class Op_>
     Node(Connections_&& _connections, PrimaryConnection_&& _connectPrimaryion,
-         Op_&& _op): connectPrimaryion(std::forward<PrimaryConnection_>(_connectPrimaryion)), connections(
+         Op_&& _op): primaryConnection(std::forward<PrimaryConnection_>(_connectPrimaryion)), connections(
            std::forward<Connections_>(_connections)),
       op(std::forward<Op_>(_op))
     {}
 
-    PrimaryConnection connectPrimaryion;
+    PrimaryConnection primaryConnection;
     Connections connections;
     Op op;
   };
@@ -36,9 +36,9 @@ namespace tillh::pipes2
 namespace tillh::pipes2
 {
   template<class Op, class Connections, class PrimaryConnection>
-  auto makeNode(Op op, Connections connections, PrimaryConnection connectPrimaryion)
+  auto makeNode(Op op, Connections connections, PrimaryConnection primaryConnection)
   {
-    return Node<Op, Connections, PrimaryConnection>(std::move(connections), std::move(connectPrimaryion), std::move(op));
+    return Node<Op, Connections, PrimaryConnection>(std::move(connections), std::move(primaryConnection), std::move(op));
   }
 
 

diff --git a/include/pipes2/detail/core/connect.hpp b/include/pipes2/detail/core/connect.hpp
@@ -71,7 +71,7 @@ namespace tillh::pipes2
   template<std::size_t index, class Node1, class Node2>
   auto replace(Node1 node1, Node2 node2)
   {
-    return makeNode(node1.op, tuple_replace<index>(node1.connections, node2), node1.connectPrimaryion);
+    return makeNode(node1.op, tuple_replace<index>(node1.connections, node2), node1.primaryConnection);
   }
 
 
@@ -140,7 +140,7 @@ namespace tillh::pipes2
     }
     else
     {
-      return makeNode(std::move(lhs.op), std::move(lhs.connections), connectPrimary_impl(lhs.connectPrimaryion, rhs));
+      return makeNode(std::move(lhs.op), std::move(lhs.connections), connectPrimary_impl(lhs.primaryConnection, rhs));
     }
   }
 

diff --git a/include/pipes2/detail/core/evaluate.hpp b/include/pipes2/detail/core/evaluate.hpp
@@ -16,7 +16,7 @@ namespace tillh::pipes2
 
     if constexpr(hasPrimary_v<NodeT>)
     {
-      return makeOutput(std::move(node.op), std::tuple_cat(std::move(node.connections), std::make_tuple(std::move(node.connectPrimaryion))));
+      return makeOutput(std::move(node.op), std::tuple_cat(std::move(node.connections), std::make_tuple(std::move(node.primaryConnection))));
     }
     else
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ namespace tillh::pipes2 @@
         if constexpr(hasPrimary_v<NodeT>)
         {
-          return makeOutput(std::move(node.op), std::tuple_cat(std::move(node.connections), std::make_tuple(std::move(node.connectPrimaryion))));
+          return makeOutput(std::move(node.op), std::tuple_cat(std::move(node.connections), std::make_tuple(std::move(node.primaryConnection))));
         }
         else
         {
@@ Expand Down @@