Changes in / [0eb18557:e869e434]

Files:

• doc/generic_types/evaluation/Makefile (modified) (1 diff)
• doc/generic_types/evaluation/cpp-vbench.cpp (modified) (1 diff)
• src/libcfa/Makefile.am (modified) (1 diff)
• src/libcfa/containers/pair (added)
• src/libcfa/containers/pair.c (added)

doc/generic_types/evaluation/Makefile

@@ -6 +6 @@
 .PHONY: all clean distclean run-c run-cpp run-cfa run
 
-all: c-bench cpp-bench cfa-bench
+all: c-bench cpp-bench cfa-bench cpp-vbench
 
 # rewrite object generation to auto-determine deps

doc/generic_types/evaluation/cpp-vbench.cpp

@@ -42 +42 @@
         )
 
-        pair max2 = { std::make_unique<boolean>(false), std::make_unique<character>('\0') };
+        auto max2 = std::make_unique<pair>( std::make_unique<boolean>(false), 
+                std::make_unique<character>('\0') );
         REPEAT_TIMED( "pop_bool_char",
-                max2 = std::max( max2, t2.pop()->as<pair>() );
+                std::unique_ptr<object> x = t2.pop();
+                if ( x->as<pair>() > *max2 ) { max2.reset( static_cast<pair*>(x.release()) ); }
         )
 }

src/libcfa/Makefile.am

@@ -41 +41 @@
 CC = ${abs_top_srcdir}/src/driver/cfa
 
-headers = limits stdlib math iostream fstream iterator rational assert containers/vector
+headers = limits stdlib math iostream fstream iterator rational assert containers/pair containers/vector
 
 # not all platforms support concurrency, add option do disable it