/[gentoo-x86]/sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch
Gentoo

Contents of /sci-chemistry/pdb-extract/files/pdb-extract-3.11-gcc-4.7.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (hide annotations) (download)
Sat Jun 23 18:57:05 2012 UTC (2 years, 2 months ago) by jlec
Branch: MAIN
CVS Tags: HEAD
sci-chemistry/pdb-extract: Version Bump, #379159

(Portage version: 2.2.0_alpha111/cvs/Linux x86_64)

1 jlec 1.1 common-v4.5/src/mapped_ptr_vector.C | 14 +++++++-------
2     1 files changed, 7 insertions(+), 7 deletions(-)
3    
4     diff --git a/common-v4.5/src/mapped_ptr_vector.C b/common-v4.5/src/mapped_ptr_vector.C
5     index d7c61f3..e20a236 100644
6     --- a/common-v4.5/src/mapped_ptr_vector.C
7     +++ b/common-v4.5/src/mapped_ptr_vector.C
8     @@ -263,12 +263,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(T* inP,
9     _vector.push_back(inP);
10    
11     typename tIndex::value_type valuePair(inP->GetName(),
12     - make_pair(_vector.size() - 1, fileIndex));
13     + std::make_pair(_vector.size() - 1, fileIndex));
14    
15     _index.insert(valuePair);
16    
17     _currentName = inP->GetName();
18     - _currentIndices = make_pair(_vector.size() - 1, fileIndex);
19     + _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
20    
21     }
22    
23     @@ -281,12 +281,12 @@ void mapped_ptr_vector<T, StringCompareT>::push_back(const string& name,
24     _vector.push_back(NULL);
25    
26     typename tIndex::value_type valuePair(name,
27     - make_pair(_vector.size() - 1, fileIndex));
28     + std::make_pair(_vector.size() - 1, fileIndex));
29    
30     _index.insert(valuePair);
31    
32     _currentName = name;
33     - _currentIndices = make_pair(_vector.size() - 1, fileIndex);
34     + _currentIndices = std::make_pair(_vector.size() - 1, fileIndex);
35     }
36    
37    
38     @@ -454,7 +454,7 @@ void mapped_ptr_vector<T, StringCompareT>::erase(const string& name)
39     if (is_equal(_currentName, name, keyComp))
40     {
41     _currentName.clear();
42     - _currentIndices = make_pair(_vector.size(), (unsigned int)0);
43     + _currentIndices = std::make_pair(_vector.size(), (unsigned int)0);
44     }
45    
46     }
47     @@ -539,7 +539,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
48     if (_vector.empty())
49     {
50     // Empty container. Return invalid index.
51     - return(make_pair(_vector.size(), (unsigned int)0));
52     + return(std::make_pair(_vector.size(), (unsigned int)0));
53     }
54    
55     typename tIndex::key_compare keyComp = _index.key_comp();
56     @@ -563,7 +563,7 @@ pair<unsigned int, unsigned int> mapped_ptr_vector<T, StringCompareT>::get_indic
57     else
58     {
59     // Not found. Return invalid index.
60     - return(make_pair(_vector.size(), (unsigned int)0));
61     + return(std::make_pair(_vector.size(), (unsigned int)0));
62     }
63     }
64    

  ViewVC Help
Powered by ViewVC 1.1.20