[Liblas-commits] hg-main-tree: refactor for const-correctness and to unfriend the...

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/8404b7fd80ce
changeset: 409:8404b7fd80ce
user:      Michael P. Gerlek <mpg at flaxen.com>
date:      Wed Mar 23 10:47:37 2011 -0700
description:
refactor for const-correctness and to unfriend the Iter

diffstat:

 include/libpc/filters/MosaicFilter.hpp |  3 ---
 src/filters/MosaicFilterIterator.cpp   |  2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 387bd333b05c -r 8404b7fd80ce include/libpc/filters/MosaicFilter.hpp
--- a/include/libpc/filters/MosaicFilter.hpp	Wed Mar 23 10:47:00 2011 -0700
+++ b/include/libpc/filters/MosaicFilter.hpp	Wed Mar 23 10:47:37 2011 -0700
@@ -42,13 +42,10 @@
 
 namespace libpc { namespace filters {
 
-class MosaicFilterIterator;
 
 // this doesn't derive from Stage since it takes more than one stage as input
 class LIBPC_DLL MosaicFilter : public Stage
 {
-    friend class MosaicFilterIterator;
-
 public:
     // entries may not be null
     // vector.size() must be > 0
diff -r 387bd333b05c -r 8404b7fd80ce src/filters/MosaicFilterIterator.cpp
--- a/src/filters/MosaicFilterIterator.cpp	Wed Mar 23 10:47:00 2011 -0700
+++ b/src/filters/MosaicFilterIterator.cpp	Wed Mar 23 10:47:37 2011 -0700
@@ -107,7 +107,7 @@
     for (size_t i=0; i<getPrevIterators().size(); i++)
     {
         Iterator* iterator = getPrevIterators()[i];
-        Stage& stage = const_cast<Stage&>(iterator->getStage());       // BUG BUG BUG
+        const Stage& stage = iterator->getStage();
 
         const boost::uint64_t stageStopIndex = stageStartIndex + stage.getNumPoints();