Merge remote-tracking branch 'upstream/master'

2 files changed, 51 insertions, 0 deletions

diff --git a/challenge-171/deadmarshal/cpp/ch-1.cpp b/challenge-171/deadmarshal/cpp/ch-1.cpp
new file mode 100644
index 0000000000..388cb0b7a4
--- /dev/null
+++ b/challenge-171/deadmarshal/cpp/ch-1.cpp
@@ -0,0 +1,34 @@
+#include<iostream>
+#include<vector>
+#include<cmath>
+
+template<typename T>
+T divisors_sum(T n)
+{
+  T sum{};
+  for(T i = 1; i < n / 2+1; ++i)
+    if(n % i == 0) sum += i; 
+  return sum;
+}
+
+template<typename T>
+std::vector<T> abundant_odd_numbers()
+{
+  std::vector<T> vec{};
+  int i = 1;
+  do{
+    if((divisors_sum(i) > i) && (i % 2 != 0)) vec.push_back(i);
+    i++;
+  }while(vec.size() != 20);
+  return vec;
+}
+
+int main()
+{
+  std::vector<int> vec = abundant_odd_numbers<int>();
+  for(const auto& e : vec)
+    std::cout << e << ' ';
+  std::cout << '\n';
+  return 0;
+}
+
diff --git a/challenge-171/deadmarshal/cpp/ch-2.cpp b/challenge-171/deadmarshal/cpp/ch-2.cpp
new file mode 100644
index 0000000000..ff23f617ed
--- /dev/null
+++ b/challenge-171/deadmarshal/cpp/ch-2.cpp
@@ -0,0 +1,17 @@
+#include<iostream>
+#include<functional>
+
+std::function<int(int)> f = [](auto n){return n + 2;};
+std::function<int(int)> g = [](auto n){return n * 2;};
+
+template<typename F, typename G>
+auto compose(F f, G g)
+{
+  return [f,g](auto n){return f(g(n));};
+}
+
+int main()
+{
+  std::cout << compose(f, g)(5) << '\n';
+  return 0;
+}