1 |
jlec 12/06/02 12:57:09 |
2 |
|
3 |
Added: cifparse-obj-7.025-gcc4.7.patch |
4 |
Log: |
5 |
sci-libs/cifparse-obj: Fix for gcc-4.7 |
6 |
|
7 |
(Portage version: 2.2.0_alpha109/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cifparse-obj/files/cifparse-obj-7.025-gcc4.7.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: cifparse-obj-7.025-gcc4.7.patch |
16 |
=================================================================== |
17 |
common-v4.5/src/mapped_ptr_vector.C | 14 +++++++------- |
18 |
1 files changed, 7 insertions(+), 7 deletions(-) |
19 |
|
20 |
diff --git a/common-v4.5/src/mapped_ptr_vector.C b/common-v4.5/src/mapped_ptr_vector.C |
21 |
index 0ffff35..993d0b9 100644 |
22 |
--- a/common-v4.5/src/mapped_ptr_vector.C |
23 |
+++ b/common-v4.5/src/mapped_ptr_vector.C |
24 |
@@ -256,12 +256,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(T* inP, |
25 |
_vector.push_back(inP); |
26 |
|
27 |
typename tIndex::value_type valuePair(inP->GetName(), |
28 |
- make_pair(_vector.size() - 1, fileIndex)); |
29 |
+ std::make_pair(_vector.size() - 1, fileIndex)); |
30 |
|
31 |
_index.insert(valuePair); |
32 |
|
33 |
_currentName = inP->GetName(); |
34 |
- _currentIndices = make_pair(_vector.size() - 1, fileIndex); |
35 |
+ _currentIndices = std::make_pair(_vector.size() - 1, fileIndex); |
36 |
|
37 |
} |
38 |
|
39 |
@@ -274,12 +274,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(const string& name, |
40 |
_vector.push_back(NULL); |
41 |
|
42 |
typename tIndex::value_type valuePair(name, |
43 |
- make_pair(_vector.size() - 1, fileIndex)); |
44 |
+ std::make_pair(_vector.size() - 1, fileIndex)); |
45 |
|
46 |
_index.insert(valuePair); |
47 |
|
48 |
_currentName = name; |
49 |
- _currentIndices = make_pair(_vector.size() - 1, fileIndex); |
50 |
+ _currentIndices = std::make_pair(_vector.size() - 1, fileIndex); |
51 |
} |
52 |
|
53 |
|
54 |
@@ -447,7 +447,7 @@ void mapped_ptr_vector<T, StringCompareT>::erase(const string& name) |
55 |
if (is_equal(_currentName, name, keyComp)) |
56 |
{ |
57 |
_currentName.clear(); |
58 |
- _currentIndices = make_pair(_vector.size(), (unsigned int)0); |
59 |
+ _currentIndices = std::make_pair(_vector.size(), (unsigned int)0); |
60 |
} |
61 |
|
62 |
} |
63 |
@@ -532,7 +532,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic |
64 |
if (_vector.empty()) |
65 |
{ |
66 |
// Empty container. Return invalid index. |
67 |
- return(make_pair(_vector.size(), (unsigned int)0)); |
68 |
+ return(std::make_pair(_vector.size(), (unsigned int)0)); |
69 |
} |
70 |
|
71 |
typename tIndex::key_compare keyComp = _index.key_comp(); |
72 |
@@ -556,7 +556,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic |
73 |
else |
74 |
{ |
75 |
// Not found. Return invalid index. |
76 |
- return(make_pair(_vector.size(), (unsigned int)0)); |
77 |
+ return(std::make_pair(_vector.size(), (unsigned int)0)); |
78 |
} |
79 |
} |