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

This commit is contained in:
Kohei Takahashi
2014-08-25 00:36:36 +09:00
12 changed files with 337 additions and 141 deletions

View File

@ -46,5 +46,9 @@ test-suite iterator
[ run permutation_iterator_test.cpp : : : # <stlport-iostream>on
]
[ run function_input_iterator_test.cpp ]
[ run generator_iterator_test.cpp ]
[ run minimum_category.cpp ]
[ compile-fail minimum_category_compile_fail.cpp ]
;