Changeset 1817 for branches

Timestamp:

08/02/10 15:23:42 (14 years ago)

Author:

Takeshi Nakazato

Message:

Changed handling of reader_ attribute.

Location:

branches/newfiller/src

Files:

• NROFiller.cpp (modified) (2 diffs)
• NROFiller.h (modified) (1 diff)

branches/newfiller/src/NROFiller.cpp

@@ -42 +42 @@
   // get appropriate reader object
   String format ;
-  if ( (reader_ = getNROReader( filename, format )) == 0 ) {
+  reader_ = getNROReader( filename, format ) ;
+  if ( reader_.null() == True ) {
     status = false ;
     return status ;
@@ -241 +242 @@
 void NROFiller::close() 
 {
-  if ( reader_ ) 
-    delete reader_ ;
-  reader_ = 0 ;
+  if (reader_.null() != False) {
+    reader_ = 0;
+  }
+  table_ = 0;
 }
 

branches/newfiller/src/NROFiller.h

@@ -57 +57 @@
 
     // pointer to the reader
-    NROReader *reader_ ;
+    //NROReader *reader_ ;
+    casa::CountedPtr<NROReader> reader_ ;
 };