Workaround for GCC44 vector using copy-constructor
Replaced lambda expression with function object
Reverted original condition_variable test