[PPL-devel] [GIT] ppl/ppl(bounded_arithmetic): Added definitions of the functions for operators Bitwise.

[Alberto Gioia]

Module: ppl/ppl
Branch: bounded_arithmetic
Commit: fb91863a113480321fc0b9ea90de94f134cc2c9c
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fb91863a113480321fc0b9ea90de94f134cc2c9c

Author: Alberto Gioia <alberto.gioi1 at studenti.unipr.it>
Date:   Fri Jun 24 17:09:45 2011 +0200

Added definitions of the functions for operators Bitwise.

---

 src/Interval.defs.hh |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Interval.defs.hh b/src/Interval.defs.hh
index afaeccf..19a438c 100644
--- a/src/Interval.defs.hh
+++ b/src/Interval.defs.hh
@@ -853,27 +853,27 @@ public:
 
   template <typename From1, typename From2>
   typename Enable_If<((Is_Singleton<From1>::value || Is_Interval<From1>::value)
-                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), I_Result>::type
+                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), void>::type
   or_assign(const From1& x, const From2& y);
 
   template <typename From1, typename From2>
   typename Enable_If<((Is_Singleton<From1>::value || Is_Interval<From1>::value)
-                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), I_Result>::type
+                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), void>::type
   and_assign(const From1& x, const From2& y);
 
   template <typename From1, typename From2>
   typename Enable_If<((Is_Singleton<From1>::value || Is_Interval<From1>::value)
-                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), I_Result>::type
+                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), void>::type
   xor_assign(const From1& x, const From2& y);
 
   template <typename From1, typename From2>
   typename Enable_If<((Is_Singleton<From1>::value || Is_Interval<From1>::value)
-                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), I_Result>::type
+                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), void>::type
   lshift_assign(const From1& x, const From2& y);
 
   template <typename From1, typename From2>
   typename Enable_If<((Is_Singleton<From1>::value || Is_Interval<From1>::value)
-                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), I_Result>::type
+                      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), void>::type
   rshift_assign(const From1& x, const From2& y);
 
   template <typename From1, typename From2>
@@ -891,6 +891,14 @@ public:
 		      && (Is_Singleton<From2>::value || Is_Interval<From2>::value)), I_Result>::type
   div_assign(const From1& x, const From2& y);
 
+  template <typename From>
+  typename Enable_If<((Is_Singleton<From>::value || Is_Interval<From>::value)), void>::type
+  max(const From& x);
+
+  template <typename From>
+  typename Enable_If<((Is_Singleton<From>::value || Is_Interval<From>::value)), void>::type
+  min(const From& x);
+
   template <typename From, typename Iterator>
   typename Enable_If<Is_Interval<From>::value, void>::type
   CC76_widening_assign(const From& y, Iterator first, Iterator last);