Changeset 7808 for trunk/MagicSoft/Mars/mbase
- Timestamp:
- 07/26/06 16:01:52 (18 years ago)
- Location:
- trunk/MagicSoft/Mars/mbase
- Files:
-
- 30 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/mbase/MArgs.cc
r7169 r7808 46 46 using namespace std; 47 47 48 void MArgsEntry::Print(const Option_t * o) const48 void MArgsEntry::Print(const Option_t *) const 49 49 { 50 50 gLog << all << *this << endl; -
trunk/MagicSoft/Mars/mbase/MArray.h
r4955 r7808 22 22 MArray() { fN = 0; } 23 23 MArray(UInt_t n) { fN = n; } 24 MArray(const MArray &a) 24 MArray(const MArray &a) : TObject() { fN = a.fN; } 25 25 virtual ~MArray() { fN = 0; } 26 26 -
trunk/MagicSoft/Mars/mbase/MArrayB.h
r4915 r7808 46 46 } 47 47 48 MArrayB(const MArrayB &array) 48 MArrayB(const MArrayB &array) : MArray() 49 49 { 50 50 // Copy constructor. -
trunk/MagicSoft/Mars/mbase/MArrayD.h
r5088 r7808 37 37 } 38 38 39 MArrayD(const MArrayD &array) 39 MArrayD(const MArrayD &array) : MArray() 40 40 { 41 41 // Copy constructor. -
trunk/MagicSoft/Mars/mbase/MArrayF.h
r5298 r7808 37 37 } 38 38 39 MArrayF(const MArrayF &array) 39 MArrayF(const MArrayF &array) : MArray() 40 40 { 41 41 // Copy constructor. -
trunk/MagicSoft/Mars/mbase/MArrayI.h
r5088 r7808 36 36 } 37 37 38 MArrayI(const MArrayI &array) 38 MArrayI(const MArrayI &array) : MArray() 39 39 { 40 40 // Copy constructor. -
trunk/MagicSoft/Mars/mbase/MArrayS.h
r4916 r7808 44 44 } 45 45 46 MArrayS(const MArrayS &array) 46 MArrayS(const MArrayS &array) : MArray() 47 47 { 48 48 // Copy constructor. -
trunk/MagicSoft/Mars/mbase/MContinue.cc
r7772 r7808 231 231 } 232 232 233 void MContinue::Print(Option_t * o) const233 void MContinue::Print(Option_t *) const 234 234 { 235 235 *fLog << all << GetDescriptor() << ":"; -
trunk/MagicSoft/Mars/mbase/MDirIter.cc
r7438 r7808 133 133 134 134 // Create an iterator to iterate over all entries in the directory 135 MDirIter Next (dir);135 MDirIter NextD(dir); 136 136 137 137 TString c; 138 while (!(c=Next (kTRUE)).IsNull())138 while (!(c=NextD(kTRUE)).IsNull()) 139 139 { 140 140 // Do not process . and .. entries … … 155 155 void MDirIter::Add(const MDirIter &iter) 156 156 { 157 TIter Next (&iter.fList);157 TIter NextD(&iter.fList); 158 158 TObject *o=0; 159 while ((o=Next ()))159 while ((o=NextD())) 160 160 fList.Add(o->Clone()); 161 161 } … … 347 347 // matching entries are printed. 348 348 // 349 void MDirIter::Print(const Option_t *o ) const350 { 351 TString s(o );349 void MDirIter::Print(const Option_t *opt) const 350 { 351 TString s(opt); 352 352 if (s.Contains("dbg", TString::kIgnoreCase)) 353 353 fList.Print(); … … 355 355 if (!s.Contains("all", TString::kIgnoreCase)) 356 356 { 357 TIter Next (&fList);357 TIter NextD(&fList); 358 358 TObject *o=NULL; 359 while ((o=Next ()))359 while ((o=NextD())) 360 360 PrintEntry(*o); 361 361 return; 362 362 } 363 363 364 MDirIter Next (*this);364 MDirIter NextD(*this); 365 365 TString name; 366 366 TString d; 367 while (!(name=Next ()).IsNull())367 while (!(name=NextD()).IsNull()) 368 368 { 369 const TString p = Next .fCurrentPath->GetName();369 const TString p = NextD.fCurrentPath->GetName(); 370 370 if (p!=d) 371 371 { 372 372 d=p; 373 PrintEntry(*Next .fCurrentPath);373 PrintEntry(*NextD.fCurrentPath); 374 374 } 375 375 cout << " " << name << endl; … … 385 385 void MDirIter::Sort() 386 386 { 387 MDirIter Next (*this);387 MDirIter NextD(*this); 388 388 389 389 TList l; … … 391 391 392 392 TString name; 393 while (!(name=Next ()).IsNull())393 while (!(name=NextD()).IsNull()) 394 394 l.Add(new TNamed(name.Data(), "")); 395 395 … … 404 404 while ((o=NextN())) 405 405 { 406 TString dir = o->GetName();407 TString name = o->GetName();406 TString dir = o->GetName(); 407 TString fname = o->GetName(); 408 408 409 409 const Int_t last = dir.Last('/'); … … 412 412 413 413 dir.Remove(last); 414 name.Remove(0, last+1);415 416 AddDirectory(dir, name);414 fname.Remove(0, last+1); 415 416 AddDirectory(dir, fname); 417 417 } 418 418 } -
trunk/MagicSoft/Mars/mbase/MDirIter.h
r5307 r7808 30 30 fList.SetOwner(); 31 31 } 32 MDirIter(const MDirIter &dir) : fNext(&fList), fDirPtr(NULL)32 MDirIter(const MDirIter &dir) : TObject(), fNext(&fList), fDirPtr(NULL) 33 33 { 34 34 fList.SetOwner(); 35 35 36 36 TObject *o=NULL; 37 TIter Next (&dir.fList);38 while ((o=Next ()))37 TIter NextD(&dir.fList); 38 while ((o=NextD())) 39 39 AddDirectory(o->GetName(), o->GetTitle()); 40 40 } … … 62 62 { 63 63 UInt_t n = 0; 64 MDirIter Next (*this);65 while (!Next ().IsNull()) n++;64 MDirIter NextD(*this); 65 while (!NextD().IsNull()) n++; 66 66 return n; 67 67 } -
trunk/MagicSoft/Mars/mbase/MEnv.cc
r7749 r7808 101 101 // --> we have to clone it ourself 102 102 // 103 TObject *MEnv::Clone(const char * newname) const103 TObject *MEnv::Clone(const char *) const 104 104 { 105 105 MEnv *env = new MEnv("/dev/null"); -
trunk/MagicSoft/Mars/mbase/MGMap.cc
r7789 r7808 154 154 // Delete all objects stored in the TExMap 155 155 // 156 void MGMap::Delete(Option_t * opt)156 void MGMap::Delete(Option_t *) 157 157 { 158 158 Long_t key, val; … … 420 420 // Paint all elements to the pad by calling their Paint() function 421 421 // 422 void MGMap::Paint(Option_t * o)422 void MGMap::Paint(Option_t *) 423 423 { 424 424 Long_t key, val; -
trunk/MagicSoft/Mars/mbase/MGMap.h
r7789 r7808 32 32 void SetOwner(Bool_t o=kTRUE) { o ? SetBit(kIsOwner) : ResetBit(kIsOwner); } 33 33 void Add(TObject *k, TString *v=0); 34 void Delete(Option_t *opt ="");35 void Clear(Option_t *o="") { TExMap::Delete( ); }34 void Delete(Option_t *opt=""); 35 void Clear(Option_t *o="") { TExMap::Delete(o); } 36 36 37 37 // void SetNoToolTips(Bool_t b=kTRUE) { b ? SetBit(kNoToolTips) : ResetBit(kNoToolTips); } // *TOGGLE* *GETTER=HasNoToolTips -
trunk/MagicSoft/Mars/mbase/MGTask.h
r2206 r7808 26 26 MGGroupFrame *fFrame; //! 27 27 28 virtual void CreateGuiElements(MGGroupFrame * f) {}28 virtual void CreateGuiElements(MGGroupFrame *) {} 29 29 30 30 void ShowGui(); -
trunk/MagicSoft/Mars/mbase/MLog.cc
r7804 r7808 183 183 // ofstream as the default output device 184 184 // 185 MLog::MLog(ofstream & out) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fOut(&out), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0)185 MLog::MLog(ofstream &sout) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fOut(&sout), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0) 186 186 { 187 187 Init(); … … 193 193 // TGTextView as the default output device 194 194 // 195 MLog::MLog(TGTextView & out) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fOut(NULL), fOutAllocated(kFALSE), fGui(&out), fNumLines(0)195 MLog::MLog(TGTextView &sout) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fOut(NULL), fOutAllocated(kFALSE), fGui(&sout), fNumLines(0) 196 196 { 197 197 Init(); … … 276 276 } 277 277 278 void MLog::Output(ostream & out, int len)278 void MLog::Output(ostream &sout, int len) 279 279 { 280 280 if (!TestBit(eNoColors)) … … 284 284 // case 1: out << MLog::kReset; break; // all 285 285 case 0: break; // all = background color 286 case 1: out << MLog::kRed; break; // err287 case 2: out << MLog::kYellow; break; // warn288 case 3: out << MLog::kGreen; break; // inf289 default: out << MLog::kBlue; break; // all others (dbg)286 case 1: sout << MLog::kRed; break; // err 287 case 2: sout << MLog::kYellow; break; // warn 288 case 3: sout << MLog::kGreen; break; // inf 289 default: sout << MLog::kBlue; break; // all others (dbg) 290 290 } 291 291 … … 295 295 const Int_t endline = fBase[len-1]=='\n' ? 1 : 0; 296 296 // output text to screen (without trailing '\n') 297 out << TString(fBase, len-endline);297 sout << TString(fBase, len-endline); 298 298 // reset colors if working with colors 299 299 if (!TestBit(eNoColors)) 300 out << kReset;300 sout << kReset; 301 301 // output EOL of check found EOL 302 302 if (endline) 303 303 { 304 out << '\n';304 sout << '\n'; 305 305 // Check whether text was underlined 306 306 if (TestBit(kIsUnderlined) && TestBit(eNoColors)) 307 307 { 308 out << setw(len-1) << setfill('-') << "" << "\n";308 sout << setw(len-1) << setfill('-') << "" << "\n"; 309 309 ResetBit(kIsUnderlined); 310 310 } 311 311 } 312 312 } 313 out.flush();313 sout.flush(); 314 314 } 315 315 … … 638 638 // Job1.MLog.NoColors 639 639 // 640 void MLog::WriteEnv(TEnv & env, TString prefix, Bool_t print) const640 void MLog::WriteEnv(TEnv &, TString prefix, Bool_t) const 641 641 { 642 642 if (!prefix.IsNull()) -
trunk/MagicSoft/Mars/mbase/MLog.h
r7438 r7808 8 8 #include <TString.h> 9 9 #endif 10 10 #ifndef ROOT_TSystem 11 11 #include <TSystem.h> 12 #endif 12 13 13 14 #include <iostream> // base classes for MLog 14 15 15 16 16 class MArgs; … … 101 101 MLog(const char *fname, int flag=-1); 102 102 103 MLog(MLog const& log) : ostream((std::streambuf*)&log)103 MLog(MLog const& log) : std::ios(), std::streambuf(), ostream((std::streambuf*)&log), TObject() 104 104 { 105 105 fOutputLevel = log.fOutputLevel; … … 121 121 void Underline(); 122 122 123 void SetDebugLevel(int i) { fDebugLevel = i; }124 int GetDebugLevel() const { return fDebugLevel; }125 void SetOutputLevel(int i) { fOutputLevel = i; }126 void SetOutputDevice(int i) { fDevice = i; }127 void EnableOutputDevice(Flags_t f) { fDevice |= f; }128 void DisableOutputDevice(Flags_t f) { fDevice &= ~f; }129 void operator=(ofstream & out) { SetOutputFile(out); }130 void operator=(TGTextView * out) { SetOutputGui(out); }123 void SetDebugLevel(int i) { fDebugLevel = i; } 124 int GetDebugLevel() const { return fDebugLevel; } 125 void SetOutputLevel(int i) { fOutputLevel = i; } 126 void SetOutputDevice(int i) { fDevice = i; } 127 void EnableOutputDevice(Flags_t f) { fDevice |= f; } 128 void DisableOutputDevice(Flags_t f) { fDevice &= ~f; } 129 void operator=(ofstream &sout) { SetOutputFile(sout); } 130 void operator=(TGTextView *sout) { SetOutputGui(sout); } 131 131 132 132 Bool_t IsNullOutput() const { return fIsNull; } 133 133 Bool_t IsOutputDeviceEnabled(int i) const { return fDevice & i; } 134 134 135 void SetOutputGui(TGTextView * out, int flag=-1)136 { 137 fGui = out;135 void SetOutputGui(TGTextView *sout, int flag=-1) 136 { 137 fGui = sout; 138 138 CheckFlag(eGui, flag); 139 139 } 140 140 141 void SetOutputFile(ofstream & out, int flag=-1)141 void SetOutputFile(ofstream &sout, int flag=-1) 142 142 { 143 143 // … … 149 149 // 150 150 DeallocateFile(); 151 fOut = & out;151 fOut = &sout; 152 152 CheckFlag(eFile, flag); 153 153 } -
trunk/MagicSoft/Mars/mbase/MLogManip.h
r2193 r7808 12 12 }; 13 13 14 inline std::ostream &operator<<(std::ostream &lout, MLogManip u)14 inline std::ostream &operator<<(std::ostream &lout, MLogManip) 15 15 { 16 16 MLog *log=dynamic_cast<MLog*>(lout.rdbuf()); -
trunk/MagicSoft/Mars/mbase/MLogPlugin.h
r2784 r7808 9 9 { 10 10 public: 11 virtual void SetColor(int col) { }11 virtual void SetColor(int) { } 12 12 virtual void Underline() { } 13 13 virtual void WriteBuffer(const char *str, int len) = 0; -
trunk/MagicSoft/Mars/mbase/MParContainer.cc
r7804 r7808 98 98 // MParContainer copy ctor 99 99 // 100 MParContainer::MParContainer(const MParContainer &named) 100 MParContainer::MParContainer(const MParContainer &named) : TObject() 101 101 { 102 102 fName = named.fName; … … 333 333 // container, overload this function. 334 334 // 335 void MParContainer::AsciiRead(istream & fin)335 void MParContainer::AsciiRead(istream &) 336 336 { 337 337 *fLog << warn << "To use the the ascii input of " << GetName(); … … 682 682 // gui elements to a macro-file. 683 683 // 684 void MParContainer::SavePrimitive(ostream &out, Option_t * o)684 void MParContainer::SavePrimitive(ostream &out, Option_t *) 685 685 { 686 686 static UInt_t uid = 0; … … 698 698 } 699 699 700 void MParContainer::SavePrimitive(ofstream &out, Option_t * o)700 void MParContainer::SavePrimitive(ofstream &out, Option_t *) 701 701 { 702 702 SavePrimitive(static_cast<ostream&>(out)); -
trunk/MagicSoft/Mars/mbase/MParList.cc
r7804 r7808 100 100 // entries) 101 101 // 102 MParList::MParList(const MParList &ts, const char *name, const char *title) 102 MParList::MParList(const MParList &ts, const char *name, const char *title) : MParContainer() 103 103 { 104 104 Init(name, title); … … 636 636 // print some information about the current status of MParList 637 637 // 638 void MParList::Print(Option_t * t) const638 void MParList::Print(Option_t *) const 639 639 { 640 640 *fLog << all << underline << GetDescriptor() << ":" << endl; … … 777 777 // compiled programs if you are not 100% sure what you are doing. 778 778 // 779 TObjArray MParList::CreateObjList(const char *cname, UInt_t first, const UInt_t last, const char * oname)779 TObjArray MParList::CreateObjList(const char *cname, UInt_t first, const UInt_t last, const char *) 780 780 { 781 781 TObjArray list; … … 841 841 } 842 842 843 void MParList::SavePrimitive(ostream &out, Option_t * o)843 void MParList::SavePrimitive(ostream &out, Option_t *) 844 844 { 845 845 Bool_t saved = IsSavedAsPrimitive(); -
trunk/MagicSoft/Mars/mbase/MParameters.cc
r6915 r7808 81 81 } 82 82 83 void MParameterD::Print(Option_t * o) const83 void MParameterD::Print(Option_t *) const 84 84 { 85 85 *fLog << all << GetDescriptor() << ": Val=" << fVal << endl; 86 86 } 87 87 88 void MParameterDerr::Print(Option_t * o) const88 void MParameterDerr::Print(Option_t *) const 89 89 { 90 90 *fLog << all << GetDescriptor() << ": Val=" << GetVal() << " Err=" << fErr << endl; 91 91 } 92 92 93 void MParameterI::Print(Option_t * o) const93 void MParameterI::Print(Option_t *) const 94 94 { 95 95 *fLog << all << GetDescriptor() << ": Val=" << fVal << endl; -
trunk/MagicSoft/Mars/mbase/MReadSocket.h
r2490 r7808 34 34 public: 35 35 MReadSocket(int port=-1, int mtu=1500); 36 MReadSocket(MReadSocket const& log) : istream((std::streambuf*)&log)36 MReadSocket(MReadSocket const& log) : std::ios(), std::streambuf(), istream((std::streambuf*)&log) 37 37 { 38 38 } -
trunk/MagicSoft/Mars/mbase/MRunIter.cc
r5461 r7808 64 64 fmt = run>35487 ? "*_%08d_*_%s" : "*_%05d_*_%s"; 65 65 66 MDirIter Next ;67 Next .AddDirectory(p, Form(fmt, run,fIsRawFile?"*.raw":"*.root"), -1);66 MDirIter NextR; 67 NextR.AddDirectory(p, Form(fmt, run,fIsRawFile?"*.raw":"*.root"), -1); 68 68 69 const TString name(Next ());69 const TString name(NextR()); 70 70 if (name.IsNull()) 71 71 return 0; -
trunk/MagicSoft/Mars/mbase/MSearch.cc
r2494 r7808 185 185 // Process messages from the widgets. 186 186 // 187 Bool_t MSearch::ProcessMessage(Long_t msg, Long_t mp1, Long_t mp2)187 Bool_t MSearch::ProcessMessage(Long_t msg, Long_t mp1, Long_t /*mp2*/) 188 188 { 189 189 // Can be found in WidgetMessageTypes.h -
trunk/MagicSoft/Mars/mbase/MStatusArray.h
r6979 r7808 31 31 32 32 void Print(Option_t *o="") const; 33 void Print(Option_t *wildcard, Option_t * option) const33 void Print(Option_t *wildcard, Option_t *) const 34 34 { 35 35 Print(wildcard); … … 38 38 TObject *FindObject(const char *object, const char *base) const; 39 39 TObject *FindObject(const char *object) const; 40 TObject *FindObject(const TObject * o) const { return 0; }40 TObject *FindObject(const TObject *) const { return 0; } 41 41 42 42 Int_t Read(const char *name=NULL); -
trunk/MagicSoft/Mars/mbase/MTask.cc
r7804 r7808 196 196 // Copy constructor. 197 197 // 198 MTask::MTask(MTask &t) 198 MTask::MTask(MTask &t) : MInputStreamID() 199 199 { 200 200 fFilter = t.fFilter; … … 305 305 // the virtual implementation returns kTRUE 306 306 // 307 Bool_t MTask::ReInit(MParList * pList)307 Bool_t MTask::ReInit(MParList *) 308 308 { 309 309 return kTRUE; … … 319 319 // the virtual implementation returns kTRUE 320 320 // 321 Int_t MTask::PreProcess(MParList * pList)321 Int_t MTask::PreProcess(MParList *) 322 322 { 323 323 return kTRUE; … … 455 455 // and afterwards set the filter for this task. 456 456 // 457 void MTask::SavePrimitive(ostream &out, Option_t * o)457 void MTask::SavePrimitive(ostream &out, Option_t *) 458 458 { 459 459 MParContainer::SavePrimitive(out); -
trunk/MagicSoft/Mars/mbase/MTaskList.cc
r7804 r7808 108 108 // TaskList in the new TaskList. 109 109 // 110 MTaskList::MTaskList(MTaskList &ts) 110 MTaskList::MTaskList(MTaskList &ts) : MTask() 111 111 { 112 112 fTasks->AddAll(ts.fTasks); … … 175 175 } 176 176 177 Bool_t MTaskList::CheckAddToList(MTask *task, const char *type,const MTask *where) const177 Bool_t MTaskList::CheckAddToList(MTask *task, /*const char *type,*/ const MTask *where) const 178 178 { 179 179 // … … 244 244 245 245 // FIXME: We agreed to put the task into list in an ordered way. 246 if (!CheckAddToList(task, type,where))246 if (!CheckAddToList(task, /*type,*/ where)) 247 247 return kFALSE; 248 248 249 *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush; 250 task->SetStreamId(type); 249 const TString stream = type ? (TString)type : task->GetStreamId(); 250 251 *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; 252 task->SetStreamId(stream); 251 253 task->SetBit(kMustCleanup); 252 254 fTasks->AddBefore((TObject*)where, task); … … 272 274 273 275 // FIXME: We agreed to put the task into list in an ordered way. 274 if (!CheckAddToList(task, type,where))276 if (!CheckAddToList(task, /*type,*/ where)) 275 277 return kFALSE; 276 278 277 *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush; 278 task->SetStreamId(type); 279 const TString stream = type ? (TString)type : task->GetStreamId(); 280 281 *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; 282 task->SetStreamId(stream); 279 283 task->SetBit(kMustCleanup); 280 284 fTasks->AddAfter((TObject*)where, task); … … 300 304 301 305 // FIXME: We agreed to put the task into list in an ordered way. 302 if (!CheckAddToList(task , type))306 if (!CheckAddToList(task/*, type*/)) 303 307 return kFALSE; 304 308 305 *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << type << "... " << flush; 306 task->SetStreamId(type); 309 const TString stream = type ? (TString)type : task->GetStreamId(); 310 311 *fLog << inf << "Adding " << task->GetName() << " to " << GetName() << " for " << stream << "... " << flush; 312 task->SetStreamId(stream); 307 313 task->SetBit(kMustCleanup); 308 314 fTasks->Add(task); … … 812 818 // Call 'Print()' of all tasks 813 819 // 814 void MTaskList::Print(Option_t * t) const820 void MTaskList::Print(Option_t *) const 815 821 { 816 822 *fLog << all << underline << GetDescriptor() << ":" << endl; … … 1020 1026 return kTRUE; 1021 1027 1022 *fLog << inf << " Adding " << task->GetName() << " to" << GetName() << " for " << obj->GetStreamId() << "... " << flush;1028 *fLog << inf << "Replacing " << task->GetName() << " in " << GetName() << " for " << obj->GetStreamId() << "... " << flush; 1023 1029 task->SetStreamId(obj->GetStreamId()); 1024 1030 task->SetBit(kMustCleanup); -
trunk/MagicSoft/Mars/mbase/MTaskList.h
r7804 r7808 32 32 void Remove(MTask *task); 33 33 void StreamPrimitive(ostream &out) const; 34 Bool_t CheckAddToList(MTask *task, const char *tType,const MTask *where=NULL) const;34 Bool_t CheckAddToList(MTask *task, /*const char *tType,*/ const MTask *where=NULL) const; 35 35 36 36 public: -
trunk/MagicSoft/Mars/mbase/MTime.h
r7458 r7808 62 62 } 63 63 MTime(Double_t mjd); 64 MTime(const MTime& t) : fMjd(t.fMjd), fTime(t.fTime), fNanoSec(t.fNanoSec)64 MTime(const MTime& t) : MParContainer(), fMjd(t.fMjd), fTime(t.fTime), fNanoSec(t.fNanoSec) 65 65 { 66 66 Init(NULL, NULL); -
trunk/MagicSoft/Mars/mbase/MZlib.cc
r7786 r7808 81 81 // pointers by calling setg 82 82 // 83 int MZlib::fill_buffer(int putback)83 int MZlib::fill_buffer(int iputback) 84 84 { 85 85 const int num = gzread(fFile, fBuffer+4, fgBufferSize-4); … … 88 88 89 89 // reset buffer pointers 90 setg(fBuffer+(4- putback), fBuffer+4, fBuffer+4+num);90 setg(fBuffer+(4-iputback), fBuffer+4, fBuffer+4+num); 91 91 92 92 return num; … … 106 106 107 107 // gptr()-eback(): if more than four bytes are already flushed 108 const int putback = gptr()-eback()>4 ? 4 : gptr()-eback();108 const int iputback = gptr()-eback()>4 ? 4 : gptr()-eback(); 109 109 110 110 // Copy the last four bytes flushed into the putback area 111 memcpy(fBuffer+(4- putback), gptr()-putback,putback);111 memcpy(fBuffer+(4-iputback), gptr()-iputback, iputback); 112 112 113 if (fill_buffer( putback)==EOF)113 if (fill_buffer(iputback)==EOF) 114 114 return EOF; 115 115
Note:
See TracChangeset
for help on using the changeset viewer.