From 08bdbd1b697131d0c5ba371eca9181054b363cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20J=C3=A4rvi?= <jarvi@cs.tamu.edu>
Date: Mon, 17 Dec 2001 22:43:43 +0000
Subject: [PATCH] making return type deduction system not to fail at compile
 time

[SVN r12094]
---
 .../boost/lambda/detail/control_structures_impl.hpp   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/boost/lambda/detail/control_structures_impl.hpp b/include/boost/lambda/detail/control_structures_impl.hpp
index 3eda8b0..b575ffa 100644
--- a/include/boost/lambda/detail/control_structures_impl.hpp
+++ b/include/boost/lambda/detail/control_structures_impl.hpp
@@ -257,8 +257,9 @@ struct return_type_2_ifthenelsereturn;
 // if A can be converted to B and vice versa -> ambiguous
 template<int Phase, class A, class B>
 struct return_type_2_ifthenelsereturn<Phase, true, true, false, A, B> {
-  typedef typename 
-    detail::generate_error<A>::ambiguous_type_in_conditional_expression type;
+  typedef 
+    detail::return_type_deduction_failure<return_type_2_ifthenelsereturn> type;
+  // ambiguous type in conditional expression
 };
 // if A can be converted to B and vice versa and are of same type
 template<int Phase, class A, class B>
@@ -303,9 +304,9 @@ struct return_type_2_ifthenelsereturn<1, false, false, false, A, B> {
 // PHASE 6:2
 template<class A, class B>
 struct return_type_2_ifthenelsereturn<2, false, false, false, A, B> {
-  typedef typename 
-    detail::generate_error<A>::types_do_not_match_in_conditional_expression 
-      type;
+  typedef 
+    detail::return_type_deduction_failure<return_type_2_ifthenelsereturn> type;
+  // types_do_not_match_in_conditional_expression 
 };