--- C:\Documents and Settings\gabid\Local Settings\Temp\p4v\zne-gabid_zneper4.zne.zoran.com_20401\users\gabi.davar\dev-app7c-main\Shared\TPS\boost\boost\function\function_template#1.hpp	2009-03-12 22:58:41.000000000 +-0300
+++ C:\Documents and Settings\gabid\Local Settings\Temp\p4v\zne-gabid_zneper4.zne.zoran.com_20401\users\gabi.davar\dev-app7c-main\Shared\TPS\boost\boost\function\function_template#2.hpp	2009-03-12 22:58:41.000000000 +-0300
@@ -778,30 +778,32 @@
 #else
     BOOST_FUNCTION_FUNCTION&
 #endif
     operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
     {
       this->clear();
-      try {
+      BOOST_TRY  {
         this->assign_to(f);
-      } catch (...) {
+      } BOOST_CATCH (...) {
         vtable = 0;
-        throw;
+        BOOST_RETHROW;
       }
+	  BOOST_CATCH_END
       return *this;
     }
     template<typename Functor,typename Allocator>
     void assign(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a)
     {
       this->clear();
-      try {
+      BOOST_TRY{
         this->assign_to_a(f,a);
-      } catch (...) {
+      } BOOST_CATCH (...) {
         vtable = 0;
-        throw;
+        BOOST_RETHROW;
       }
+	  BOOST_CATCH_END
     }
 
 #ifndef BOOST_NO_SFINAE
     BOOST_FUNCTION_FUNCTION& operator=(clear_type*)
     {
       this->clear();
@@ -820,18 +822,19 @@
     BOOST_FUNCTION_FUNCTION& operator=(const BOOST_FUNCTION_FUNCTION& f)
     {
       if (&f == this)
         return *this;
 
       this->clear();
-      try {
+      BOOST_TRY {
         this->assign_to_own(f);
-      } catch (...) {
+      } BOOST_CATCH (...) {
         vtable = 0;
-        throw;
+        BOOST_RETHROW;
       }
+	  BOOST_CATCH_END
       return *this;
     }
 
     void swap(BOOST_FUNCTION_FUNCTION& other)
     {
       if (&other == this)
@@ -939,29 +942,28 @@
     // its buffer to *this, and set the argument's buffer pointer to NULL. 
     void move_assign(BOOST_FUNCTION_FUNCTION& f) 
     { 
       if (&f == this)
         return;
 
-#if !defined(BOOST_NO_EXCEPTIONS)      
-      try {
-#endif
+      BOOST_TRY {
         if (!f.empty()) {
           this->vtable = f.vtable;
           f.vtable->manager(f.functor, this->functor,
                             boost::detail::function::move_functor_tag);
 		  f.vtable = 0;
-#if !defined(BOOST_NO_EXCEPTIONS)      
-        } else {
+        }
+        else
+		{
           clear();
         }
-      } catch (...) {
+      } BOOST_CATCH(...) {
         vtable = 0;
-        throw;
+        BOOST_RETHROW;
       }
-#endif
+	  BOOST_CATCH_END
     }
   };
 
   template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
   inline void swap(BOOST_FUNCTION_FUNCTION<
                      R BOOST_FUNCTION_COMMA