[parchive2-cvs] library/src/tests/slice test_file_slice.cc,1.15,1.16

[<el...@us...>]

Update of /cvsroot/parchive2/library/src/tests/slice
In directory sc8-pr-cvs1:/tmp/cvs-serv2478/src/tests/slice

Modified Files:
	test_file_slice.cc 
Log Message:
Fixed a bad CVS UPDATE


Index: test_file_slice.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/tests/slice/test_file_slice.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** test_file_slice.cc	7 May 2003 03:13:56 -0000	1.15
--- test_file_slice.cc	7 May 2003 03:32:04 -0000	1.16
***************
*** 116,144 ****
      int off3 = 10;
    
- <<<<<<< test_file_slice.cc
-      File* temp2 = new File(*temp);
-      if((temp2->open(fstream::out|fstream::binary)) == NULL)
- 	 cerr<"File_Slice:Could not open temp2 file"<<endl;
-      File_Slice* tempSlice2 =  new File_Slice(temp2,off2,size);
-      tempSlice2->setAutoFlush(true);
-      tempSlice2->Set_Slice_Bytes(in_bytes);
-      cerr << "File_Slice:Set_Slice_Bytes: CALL SUCCESS" << endl;
- 
-      temp2->close();
-      //code taken from Ross
-      ifstream in;
-      char file_slice_buffer[S];   
-      areVectorsEqual = true;
-      if((in.open(filename.c_str(), ios::in)) == NULL)
- 	 cerr<<"File_Slice:Could not open file"<<endl;
-      in.seekg(off2);         // move filepos pointer to offset mark
- 
-      int i = 0;
-      while(i < S){
-        if(!in.eof()){
- 	in.read(&file_slice_buffer[i], 1);
- 	if(!(file_slice_buffer[i]==in_bytes[i])) areVectorsEqual=false;
-        }
- =======
      File temp3("temp_file_slice_test_3.txt");
      temp3.open(fstream::out|fstream::binary);
--- 116,119 ----
***************
*** 161,165 ****
  	  areVectorsEqual=false;
        }
- >>>>>>> 1.14
        i++;
      } // end while
--- 136,139 ----