From 6e5004b6f40fa8154313e98300158efb6ec7f900 Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Tue, 14 Jan 2014 12:39:07 +0900 Subject: [PATCH] fix testspr --- sprout/random/random_result.hpp | 6 ------ tools/testspr/test.py | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sprout/random/random_result.hpp b/sprout/random/random_result.hpp index b4175a8e..4e44e424 100644 --- a/sprout/random/random_result.hpp +++ b/sprout/random/random_result.hpp @@ -79,9 +79,6 @@ namespace sprout { , engine_(engine) , distribution_(distribution) {} - SPROUT_CONSTEXPR operator result_type() const SPROUT_NOEXCEPT { - return result_; - } SPROUT_CONSTEXPR random_result operator()() const { return distribution_(engine_); } @@ -210,9 +207,6 @@ namespace sprout { : result_(result) , engine_(engine) {} - SPROUT_CONSTEXPR operator result_type() const SPROUT_NOEXCEPT { - return result_; - } SPROUT_CONSTEXPR random_result operator()() const { return engine_(); } diff --git a/tools/testspr/test.py b/tools/testspr/test.py index 539b56e1..47fd4160 100644 --- a/tools/testspr/test.py +++ b/tools/testspr/test.py @@ -56,15 +56,17 @@ def main(): pool = multiprocessing.Pool(opts.max_procs if opts.max_procs != 0 else None) return sum(result != 0 for result in pool.map( build, - [format_command('gcc', version, opts.gcc_root) + ([format_command('gcc', version, opts.gcc_root) for version in opts.gcc_version.split(' ') ] if opts.gcc_version != ' ' else [] + ) + - [format_command('clang', version, opts.clang_root) + ([format_command('clang', version, opts.clang_root) for version in opts.clang_version.split(' ') ] if opts.clang_version != ' ' else [] + ) )) if __name__ == "__main__":