summaryrefslogtreecommitdiff
path: root/src/mongo/unittest
diff options
context:
space:
mode:
authorAndrea Lattuada <andrea.lattuada@10gen.com>2012-11-14 16:18:27 -0500
committerAndrea Lattuada <andrea.lattuada@10gen.com>2012-11-14 16:18:27 -0500
commit2e5ac90c8b205e09b6ac6985c882da0a125b72b7 (patch)
treed8e2539cca53fbbb36083dea8fe7da774fe64401 /src/mongo/unittest
parentb787da9413a7e698efb3706246fe6c4e4352c461 (diff)
downloadmongo-2e5ac90c8b205e09b6ac6985c882da0a125b72b7.tar.gz
fix solaris build failure due to collision of template param and macro
Diffstat (limited to 'src/mongo/unittest')
-rw-r--r--src/mongo/unittest/unittest.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/unittest/unittest.h b/src/mongo/unittest/unittest.h
index 0a1e573fd60..ccfb8dabfc3 100644
--- a/src/mongo/unittest/unittest.h
+++ b/src/mongo/unittest/unittest.h
@@ -418,9 +418,9 @@ namespace mongo {
/**
* Helper for ASSERT_APPROX_EQUAL to ensure that the arguments are evaluated only once.
*/
- template < typename A, typename B, typename ERR >
+ template < typename A, typename B, typename ABSOLUTE_ERR >
inline void assertApproxEqual(const std::string& aexp, const std::string& bexp,
- const A& a, const B& b, const ERR& absoluteErr,
+ const A& a, const B& b, const ABSOLUTE_ERR& absoluteErr,
const std::string& file , unsigned line) {
if (std::abs(a - b) <= absoluteErr)
return;