Merge upstream branch 'develop' into pr/zip_iterator/fusionize

Signed-off-by: Kohei Takahashi <flast@flast.jp>
2014-07-03 21:52:26 +09:00
parent aad767ed3f e000b676cc
commit 11f7d1bc18
68 changed files with 293 additions and 237 deletions
@@ -46,5 +46,5 @@ test-suite iterator
    [ run permutation_iterator_test.cpp : : : # <stlport-iostream>on
    ]
    [ run function_input_iterator_test.cpp ]
-
+    [ run generator_iterator_test.cpp ]
 ;