1 | --- 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
|
---|
2 | +++ 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
|
---|
3 | @@ -778,30 +778,32 @@
|
---|
4 | #else
|
---|
5 | BOOST_FUNCTION_FUNCTION&
|
---|
6 | #endif
|
---|
7 | operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
|
---|
8 | {
|
---|
9 | this->clear();
|
---|
10 | - try {
|
---|
11 | + BOOST_TRY {
|
---|
12 | this->assign_to(f);
|
---|
13 | - } catch (...) {
|
---|
14 | + } BOOST_CATCH (...) {
|
---|
15 | vtable = 0;
|
---|
16 | - throw;
|
---|
17 | + BOOST_RETHROW;
|
---|
18 | }
|
---|
19 | + BOOST_CATCH_END
|
---|
20 | return *this;
|
---|
21 | }
|
---|
22 | template<typename Functor,typename Allocator>
|
---|
23 | void assign(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a)
|
---|
24 | {
|
---|
25 | this->clear();
|
---|
26 | - try {
|
---|
27 | + BOOST_TRY{
|
---|
28 | this->assign_to_a(f,a);
|
---|
29 | - } catch (...) {
|
---|
30 | + } BOOST_CATCH (...) {
|
---|
31 | vtable = 0;
|
---|
32 | - throw;
|
---|
33 | + BOOST_RETHROW;
|
---|
34 | }
|
---|
35 | + BOOST_CATCH_END
|
---|
36 | }
|
---|
37 |
|
---|
38 | #ifndef BOOST_NO_SFINAE
|
---|
39 | BOOST_FUNCTION_FUNCTION& operator=(clear_type*)
|
---|
40 | {
|
---|
41 | this->clear();
|
---|
42 | @@ -820,18 +822,19 @@
|
---|
43 | BOOST_FUNCTION_FUNCTION& operator=(const BOOST_FUNCTION_FUNCTION& f)
|
---|
44 | {
|
---|
45 | if (&f == this)
|
---|
46 | return *this;
|
---|
47 |
|
---|
48 | this->clear();
|
---|
49 | - try {
|
---|
50 | + BOOST_TRY {
|
---|
51 | this->assign_to_own(f);
|
---|
52 | - } catch (...) {
|
---|
53 | + } BOOST_CATCH (...) {
|
---|
54 | vtable = 0;
|
---|
55 | - throw;
|
---|
56 | + BOOST_RETHROW;
|
---|
57 | }
|
---|
58 | + BOOST_CATCH_END
|
---|
59 | return *this;
|
---|
60 | }
|
---|
61 |
|
---|
62 | void swap(BOOST_FUNCTION_FUNCTION& other)
|
---|
63 | {
|
---|
64 | if (&other == this)
|
---|
65 | @@ -939,29 +942,28 @@
|
---|
66 | // its buffer to *this, and set the argument's buffer pointer to NULL.
|
---|
67 | void move_assign(BOOST_FUNCTION_FUNCTION& f)
|
---|
68 | {
|
---|
69 | if (&f == this)
|
---|
70 | return;
|
---|
71 |
|
---|
72 | -#if !defined(BOOST_NO_EXCEPTIONS)
|
---|
73 | - try {
|
---|
74 | -#endif
|
---|
75 | + BOOST_TRY {
|
---|
76 | if (!f.empty()) {
|
---|
77 | this->vtable = f.vtable;
|
---|
78 | f.vtable->manager(f.functor, this->functor,
|
---|
79 | boost::detail::function::move_functor_tag);
|
---|
80 | f.vtable = 0;
|
---|
81 | -#if !defined(BOOST_NO_EXCEPTIONS)
|
---|
82 | - } else {
|
---|
83 | + }
|
---|
84 | + else
|
---|
85 | + {
|
---|
86 | clear();
|
---|
87 | }
|
---|
88 | - } catch (...) {
|
---|
89 | + } BOOST_CATCH(...) {
|
---|
90 | vtable = 0;
|
---|
91 | - throw;
|
---|
92 | + BOOST_RETHROW;
|
---|
93 | }
|
---|
94 | -#endif
|
---|
95 | + BOOST_CATCH_END
|
---|
96 | }
|
---|
97 | };
|
---|
98 |
|
---|
99 | template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
|
---|
100 | inline void swap(BOOST_FUNCTION_FUNCTION<
|
---|
101 | R BOOST_FUNCTION_COMMA
|
---|