Просмотр исходного кода

Added missing #include <utility> and qualified
make_pair with std:: to library_status.cpp.

Added missing headers to make1.c and missing prototypes
to builtin.h

Modified execunix.c to add support for terminating
processes that consume too much cpu or that hang and
fail to consume cpu at all. This in support of the
bjam -lx option.

http://svn.boost.org/trac/boost/ticket/1266#comment:2



[SVN r39334]

K. Noel Belcourt 18 лет назад
Родитель
Сommit
b0742ea3a4
2 измененных файлов с 8 добавлено и 7 удалено
  1. 1 1
      tools/build
  2. 7 6
      tools/regression/library_status.cpp

+ 1 - 1
tools/build

@@ -1 +1 @@
-Subproject commit a0275aa3c6926d2c198bffe03df3b38c1891ce4d
+Subproject commit 0ab51f634142bea3f586fc1d97a7a0ac13078dcd

+ 7 - 6
tools/regression/library_status.cpp

@@ -44,6 +44,7 @@ namespace xml = boost::tiny_xml;
 #include <ctime>
 #include <stdexcept>
 #include <cassert>
+#include <utility>
 
 using std::string;
 
@@ -295,12 +296,12 @@ namespace
         }
 
         links_file << "<h2><a name=\"";
-        links_file << make_pair(
+        links_file << std::make_pair(
             html_from_path(target_dir.string().begin()), 
             html_from_path(target_dir.string().end())
             )
             << "\">"
-            << make_pair(
+            << std::make_pair(
             html_from_path(target_dir.string().begin()), 
             html_from_path(target_dir.string().end())
             )
@@ -337,13 +338,13 @@ namespace
                 "See <a href=\"#"
                 << source_library_name << "-"
                 << object_library_name << "-" 
-                << make_pair(
+                << std::make_pair(
                 html_from_path(target_dir.string().begin()), 
                 html_from_path(target_dir.string().end())
                 )
                 << source_library_name << " - "
                 << object_library_name << " - " 
-                << make_pair(
+                << std::make_pair(
                 html_from_path(target_dir.string().begin()), 
                 html_from_path(target_dir.string().end())
                 )
@@ -369,13 +370,13 @@ namespace
                 {
                     links_file << "<h2><a name=\""
                         << object_library_name << "-" 
-                        << make_pair(
+                        << std::make_pair(
                         html_from_path(target_dir.string().begin()), 
                         html_from_path(target_dir.string().end())
                         )
                         << "\">"
                         << object_library_name << " - " 
-                        << make_pair(
+                        << std::make_pair(
                         html_from_path(target_dir.string().begin()), 
                         html_from_path(target_dir.string().end())
                         )

粤ICP备19079148号