1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
Description: fix FTBFS with gcc-4.7
Author: Philipp Büttgenbach <Philipp.Buettgenbach@gmx.de>
Reviewed-by: Anton Gladky <gladky.anton@gmail.com>
Last-Update: 2012-04-20
--- a/include/gmm/gmm_except.h
+++ b/include/gmm/gmm_except.h
@@ -76,7 +76,7 @@
}
# define GMM_THROW_(type, errormsg) { \
std::stringstream msg; \
- msg << "Error in "__FILE__ << ", line " \
+ msg << "Error in " << __FILE__ << ", line " \
<< __LINE__ << " " << GMM_PRETTY_FUNCTION << ": \n" \
<< errormsg << ends; \
throw (type)(msg.str()); \
@@ -91,7 +91,7 @@
}
# define GMM_THROW_(type, errormsg) { \
std::stringstream msg; \
- msg << "Error in "__FILE__ << ", line " \
+ msg << "Error in " << __FILE__ << ", line " \
<< __LINE__ << " " << GMM_PRETTY_FUNCTION << ": \n" \
<< errormsg << ends; \
::abort(); \
@@ -148,7 +148,7 @@
#define GMM_WARNING_MSG(level_, thestr) { \
std::stringstream msg; \
- msg << "Level " << level_ << " Warning in "__FILE__ << ", line " \
+ msg << "Level " << level_ << " Warning in " << __FILE__ << ", line " \
<< __LINE__ << ": " << thestr << ends; \
std::cerr << msg.str() << std::endl; \
}
@@ -210,7 +210,7 @@
#define GMM_TRACE_MSG(level_, thestr) { \
GMM_TRACE_MSG_MPI { \
std::stringstream msg; \
- msg << "Trace " << level_ << " in "__FILE__ << ", line " \
+ msg << "Trace " << level_ << " in " << __FILE__ << ", line " \
<< __LINE__ << ": " << thestr \
<< ends; \
std::cout << msg.str() << std::endl; \
Description: fix FTBFS with gcc-4.7
Author: Anton Gladky <gladky.anton@gmail.com>
Last-Update: 2012-05-25
--- a/include/gmm/gmm_vector.h
+++ b/include/gmm/gmm_vector.h
@@ -235,14 +235,14 @@
template<typename T> void wsvector<T>::clean(double eps) {
iterator it = this->begin(), itf = it, ite = this->end();
while (it != ite) {
- ++itf; if (gmm::abs(it->second) <= eps) erase(it); it = itf;
+ ++itf; if (gmm::abs(it->second) <= eps) base_type::erase(it); it = itf;
}
}
template<typename T> void wsvector<T>::resize(size_type n) {
if (n < nbl) {
iterator it = this->begin(), itf = it, ite = this->end();
- while (it != ite) { ++itf; if (it->first >= n) erase(it); it = itf; }
+ while (it != ite) { ++itf; if (it->first >= n) base_type::erase(it); it = itf; }
}
nbl = n;
}
|
GitWeb
