Merge branch 'develop'

2014-06-05 02:38:34 +03:00
parent 8779e0e715 2d9362fe89
commit 21afa3d8ec
3 changed files with 2 additions and 1 deletions
--- a/doc/generator_iterator.htm
+++ b/doc/generator_iterator.htm
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@ -44,5 +44,6 @@ test-suite iterator
    [ run permutation_iterator_test.cpp : : : # <stlport-iostream>on 
    ]
    [ run function_input_iterator_test.cpp ]
-      
+    [ run generator_iterator_test.cpp ]
+
 ;
--- a/test/generator_iterator_test.cpp
+++ b/test/generator_iterator_test.cpp