Merge pull request #1380 from gentryx/master

resolved warning in CMake 3.1 and newer
STEllAR-GROUP · Feb 23, 2015 · cb4efc2 · cb4efc2
2 parents e6ced00 + 93369f3
commit cb4efc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/HPX_SetupTarget.cmake b/cmake/HPX_SetupTarget.cmake
@@ -5,6 +5,8 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+cmake_policy(SET CMP0054 NEW)
+
 function(hpx_setup_target target)
   # retrieve arguments
   set(options EXPORT NOHPX_INIT INSTALL NOLIBS PLUGIN)

diff --git a/hpx/lcos/when_all.hpp b/hpx/lcos/when_all.hpp
@@ -335,8 +335,6 @@ namespace hpx { namespace lcos
     lcos::future<std::vector<Future> > //-V659
     when_all(std::vector<Future>&& values)
     {
-        typedef std::vector<Future> result_type;
-
         typedef detail::when_all_frame<
                 hpx::util::tuple<std::vector<Future> >
             > frame_type;