[Liblas-commits] hg-main-tree: http://stackoverflow.com/questions/656948/a-class-...

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/4685539ca0f9
changeset: 384:4685539ca0f9
user:      Howard Butler <hobu.inc at gmail.com>
date:      Tue Mar 22 10:39:17 2011 -0500
description:
http://stackoverflow.com/questions/656948/a-class-key-must-be-declared-when-declaring-a-friend states that we must use 'friend class className' to satisfy gcc rather than merely 'friend className'  I don't know why, and I don't have any friends

diffstat:

 include/libpc/drivers/las/Reader.hpp    |  2 +-
 include/libpc/drivers/liblas/Reader.hpp |  2 +-
 include/libpc/filters/CacheFilter.hpp   |  2 +-
 include/libpc/filters/MosaicFilter.hpp  |  2 +-
 src/drivers/oci/Writer.cpp              |  6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diffs (73 lines):

diff -r 771da57f961e -r 4685539ca0f9 include/libpc/drivers/las/Reader.hpp
--- a/include/libpc/drivers/las/Reader.hpp	Tue Mar 22 07:34:07 2011 -0700
+++ b/include/libpc/drivers/las/Reader.hpp	Tue Mar 22 10:39:17 2011 -0500
@@ -47,7 +47,7 @@
 
 class LIBPC_DLL LasReader : public Stage
 {
-    friend Iterator;
+    friend class Iterator;
 
 public:
     LasReader(std::istream&);
diff -r 771da57f961e -r 4685539ca0f9 include/libpc/drivers/liblas/Reader.hpp
--- a/include/libpc/drivers/liblas/Reader.hpp	Tue Mar 22 07:34:07 2011 -0700
+++ b/include/libpc/drivers/liblas/Reader.hpp	Tue Mar 22 10:39:17 2011 -0500
@@ -54,7 +54,7 @@
 
 class LIBPC_DLL LiblasReader : public Stage
 {
-    friend Iterator;
+    friend class Iterator;
 
 public:
     LiblasReader(std::istream&);
diff -r 771da57f961e -r 4685539ca0f9 include/libpc/filters/CacheFilter.hpp
--- a/include/libpc/filters/CacheFilter.hpp	Tue Mar 22 07:34:07 2011 -0700
+++ b/include/libpc/filters/CacheFilter.hpp	Tue Mar 22 10:39:17 2011 -0500
@@ -53,7 +53,7 @@
 // If more than one point is read, the cache is skipped.
 class LIBPC_DLL CacheFilter : public Filter
 {
-    friend CacheFilterIterator;
+    friend class CacheFilterIterator;
 
 public:
     CacheFilter(const Stage& prevStage, boost::uint32_t numBlocks, boost::uint32_t blockSize);
diff -r 771da57f961e -r 4685539ca0f9 include/libpc/filters/MosaicFilter.hpp
--- a/include/libpc/filters/MosaicFilter.hpp	Tue Mar 22 07:34:07 2011 -0700
+++ b/include/libpc/filters/MosaicFilter.hpp	Tue Mar 22 10:39:17 2011 -0500
@@ -47,7 +47,7 @@
 // this doesn't derive from Stage since it takes more than one stage as input
 class LIBPC_DLL MosaicFilter : public Stage
 {
-    friend MosaicFilterIterator;
+    friend class MosaicFilterIterator;
 
 public:
     // entries may not be null
diff -r 771da57f961e -r 4685539ca0f9 src/drivers/oci/Writer.cpp
--- a/src/drivers/oci/Writer.cpp	Tue Mar 22 07:34:07 2011 -0700
+++ b/src/drivers/oci/Writer.cpp	Tue Mar 22 10:39:17 2011 -0500
@@ -617,7 +617,7 @@
     if (!BlockTableExists())
         CreateBlockTable();
     
-    m_stage.seekToPoint(0);
+    // m_stage.seekToPoint(0);
     return;
 }
 
@@ -947,10 +947,10 @@
         boost::uint32_t count = 0;
         for (it = ids.begin(); it != ids.end(); it++)
         {
-            m_stage.seekToPoint(*it);
+            // m_stage.seekToPoint(*it);
             
             // FIXME: Use a user bounds here instead of reading everything  
-            m_stage.read(buffer);
+            // m_stage.read(buffer);
             
             block.copyPointsFast(static_cast<std::size_t>(count), static_cast<std::size_t>(0), buffer, 1); // put single point onto our block