really screwy merge trancking behavior, starting over

[SVN r44394]
post-review proto version
2026-01-29 07:32:15 +00:00 · 2008-04-14 05:45:24 +00:00 · 2008-04-05 18:00:00 +00:00
1 changed files with 1 additions and 1 deletions
--- a/include/boost/function/detail/prologue.hpp
+++ b/include/boost/function/detail/prologue.hpp
@@ -11,7 +11,7 @@
 #define BOOST_FUNCTION_PROLOGUE_HPP
 #  include <cassert>
 #  include <algorithm>
-#  include <boost/config/no_tr1/functional.hpp> // unary_function, binary_function
+#  include <functional> // unary_function, binary_function
 #  include <boost/throw_exception.hpp>
 #  include <boost/config.hpp>
 #  include <boost/function/function_base.hpp>
Author	SHA1	Message	Date
Eric Niebler	3e49b36539	really screwy merge trancking behavior, starting over [SVN r44394]	2008-04-14 05:45:24 +00:00
Eric Niebler	fc782cd4fe	post-review proto version [SVN r44061]	2008-04-05 18:00:00 +00:00