openvrml-commit

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17441/src/libopenvrml

Modified Files:
	private.h 
Log Message:
Changed fequal, fless_equal, and fgreater_equal to be instances of types that have a template operator().

Index: private.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/private.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** private.h	18 Feb 2006 05:41:57 -0000	1.10
--- private.h	2 Aug 2006 03:20:02 -0000	1.11
***************
*** 115,121 ****
          }
  
!         template <typename Float>
!         struct OPENVRML_LOCAL fequal :
!             std::binary_function<Float, Float, bool> {
              bool operator()(Float a, Float b) const
              {
--- 115,120 ----
          }
  
!         struct OPENVRML_LOCAL fequal_t {
!             template <typename Float>
              bool operator()(Float a, Float b) const
              {
***************
*** 130,151 ****
          };
  
!         template <typename Float>
!         struct OPENVRML_LOCAL fless_equal :
!             std::binary_function<Float, Float, bool> {
              bool operator()(Float a, Float b) const
              {
!                 return a < b || fequal<Float>()(a, b);
              }
          };
  
!         template <typename Float>
!         struct OPENVRML_LOCAL fgreater_equal :
!             std::binary_function<Float, Float, bool> {
              bool operator()(Float a, Float b) const
              {
!                 return a > b || fequal<Float>()(a, b);
              }
          };
  
  
          class OPENVRML_LOCAL scope_guard_impl_base {
--- 129,154 ----
          };
  
!         const fequal_t fequal = fequal_t();
! 
!         struct OPENVRML_LOCAL fless_equal_t {
!             template <typename Float>
              bool operator()(Float a, Float b) const
              {
!                 return a < b || fequal(a, b);
              }
          };
  
!         const fless_equal_t fless_equal = fless_equal_t();
! 
!         struct OPENVRML_LOCAL fgreater_equal_t {
!             template <typename Float>
              bool operator()(Float a, Float b) const
              {
!                 return a > b || fequal(a, b);
              }
          };
  
+         const fgreater_equal_t fgreater_equal = fgreater_equal_t();
+ 
  
          class OPENVRML_LOCAL scope_guard_impl_base {