Revision: 65090
http://sourceforge.net/p/brlcad/code/65090
Author: brlcad
Date: 2015-05-29 04:17:46 +0000 (Fri, 29 May 2015)
Log Message:
-----------
quell two failures, one for failing to return a value from a non-void function
and the other to mark an () operator const so std::map can use it
Modified Paths:
--------------
brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp
Modified: brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp
===================================================================
--- brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp 2015-05-28
21:35:29 UTC (rev 65089)
+++ brlcad/trunk/src/libgcv/conv/fastgen4/fastgen4_write.cpp 2015-05-29
04:17:46 UTC (rev 65090)
@@ -472,7 +472,7 @@
private:
struct FloatFieldComparator {
- bool operator()(const Point &lhs, const Point &rhs);
+ bool operator()(const Point &lhs, const Point &rhs) const;
};
typedef std::pair<std::map<Point, std::vector<std::size_t>,
FloatFieldComparator>::iterator, bool>
@@ -484,8 +484,7 @@
};
-inline bool GridManager::FloatFieldComparator::operator()(const Point &lhs,
- const Point &rhs)
+inline bool GridManager::FloatFieldComparator::operator()(const Point &lhs,
const Point &rhs) const
{
#define COMPARE(a, b) do { if ((a) != (b)) return (a) < (b); } while (false)
#define COMPARE_TRUNC(a, b) do { \
@@ -555,6 +554,7 @@
}
}
}
+ return results;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
