X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkAny.h;h=2d7bb9d640117d45950f5a954c24fb0e37fce060;hb=865c4a8acc43605c07d519a1d029d5361deeff54;hp=45ed57640f596d4d61d605ee232ae84fb5a89a1c;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkAny.h b/kernel/src/bbtkAny.h
index 45ed576..2d7bb9d 100644
--- a/kernel/src/bbtkAny.h
+++ b/kernel/src/bbtkAny.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAny.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/10/02 12:29:26 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -38,9 +38,7 @@
 #include "bbtkMessageManager.h"
 #include "bbtkException.h"
 
-#ifdef _USE_BOOST_
 #include <boost/type_traits/is_pointer.hpp>
-#endif 
 
 namespace bbtk 
 {
@@ -113,18 +111,18 @@ namespace bbtk
   class anyholder<ValueType*> : public anyplaceholder
   {
   public: // structors
-    
+
     anyholder(ValueType* const & value)
       : held(value)
     { }
-    
+
   public: // queries
-    
+
     virtual const std::type_info & type() const
     {
       return typeid(ValueType*);
     }
-    
+
     virtual bool is_pointer() const { return true; }
     virtual const std::type_info & pointed_type() const { return typeid(ValueType); }
     virtual void* get_pointer() const { 
@@ -136,11 +134,11 @@ namespace bbtk
     }
 
     virtual anyplaceholder * clone() const { return new anyholder(held); }
-    
+
   public: // representation
-    
+
     ValueType* held;
-    
+
   };
   //=========================================================
 
@@ -174,13 +172,13 @@ namespace bbtk
   public:
     typedef any< TypeTraits > self;
     // structors
-  
+
     /// Default constructor
     any()
       : content(0)
     {
     }
-  
+
     /// Constructor with a value of template type
     template<typename ValueType>
     any(const ValueType & value)
@@ -223,7 +221,7 @@ namespace bbtk
     {
       delete content;
     }
-  
+
 
     /// Swaps the content of this with another any
     any & swap(any & rhs)
@@ -305,7 +303,7 @@ namespace bbtk
     /// Returns true iff the contained type is t
     inline bool contains(TypeInfo t)
     {
-      return ( type() == t );
+      return ( (bool)(type() == t) );
      }
 
     /// Returns true iff any of type ValueType can be held 
@@ -451,105 +449,5 @@ namespace bbtk
 
 
 
-/*
-
-// TRY TO INCLUDE BOOST DIRECTLY : OK WORKS !
-#include <algorithm>
-#include <typeinfo>
-
-#include "boost/config.hpp"
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/type_traits/is_reference.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/static_assert.hpp>
-
-
-namespace bbtk
-{
-
-
-  class bad_any_cast : public std::bad_cast
-  {
-  public:
-    virtual const char * what() const throw()
-    {
-      return "boost::bad_any_cast: "
-	"failed conversion using boost::any_cast";
-    }
-  };
-  
-  typedef any<thing> anything;
-
-  template<typename ValueType>
-  ValueType * any_cast(anything * operand)
-  {
-    return operand && operand->type() == typeid(ValueType)
-      ? &static_cast<anything::holder<ValueType> *>(operand->content)->held
-      : 0;
-  }
-  
-    template<typename ValueType>
-    const ValueType * any_cast(const anything * operand)
-    {
-        return any_cast<ValueType>(const_cast<anything *>(operand));
-    }
-
-    template<typename ValueType>
-    ValueType any_cast(const anything & operand)
-    {
-      typedef BOOST_DEDUCED_TYPENAME boost::remove_reference<ValueType>::type nonref;
-
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-        // If 'nonref' is still reference type, it means the user has not
-        // specialized 'remove_reference'.
-
-        // Please use BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION macro
-        // to generate specialization of remove_reference for your class
-        // See type traits library documentation for details
-      BOOST_STATIC_ASSERT(!boost::is_reference<nonref>::value);
-#endif
-
-        const nonref * result = any_cast<nonref>(&operand);
-        if(!result)
-            boost::throw_exception(bad_any_cast());
-        return *result;
-    }
-
-    template<typename ValueType>
-    ValueType any_cast(anything & operand)
-    {
-      typedef BOOST_DEDUCED_TYPENAME boost::remove_reference<ValueType>::type nonref;
-
-#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-        // The comment in the above version of 'any_cast' explains when this
-        // assert is fired and what to do.
-        BOOST_STATIC_ASSERT(!is_reference<nonref>::value);
-#endif
-
-        nonref * result = any_cast<nonref>(&operand);
-        if(!result)
-            boost::throw_exception(bad_any_cast());
-        return *result;
-    }
-
-    // Note: The "unsafe" versions of any_cast are not part of the
-    // public interface and may be removed at any time. They are
-    // required where we know what type is stored in the any and can't
-    // use typeid() comparison, e.g., when our types may travel across
-    // different shared libraries.
-    template<typename ValueType>
-    inline ValueType * unsafe_any_cast(anything * operand)
-    {
-        return &static_cast<anything::holder<ValueType> *>(operand->content)->held;
-    }
-
-    template<typename ValueType>
-    inline const ValueType * unsafe_any_cast(const anything * operand)
-    {
-        return unsafe_any_cast<ValueType>(const_cast<anything *>(operand));
-    }
-}
-*/ // EO TRY TO INCLUDE BOOST
-
 #endif