casa / casa6 / 517cc8af9e0

Commits

Pam Harris authored 517cc8af9e0 25 Feb 2022

Fix deprecation warnings for functions moved to TableUtil

Modified


25 25	//#
26 26	//# $Id$
27 27
28 28
29 29
30 30	//# Includes
31 31
32 32	#include <casacore/tables/Tables/ScaColDesc.h>
33 33	#include <casacore/tables/Tables/ArrColDesc.h>
34 34	#include <casacore/tables/Tables/SetupNewTab.h>
35 +	#include <casacore/tables/Tables/TableUtil.h>
35 36	#include <casacore/tables/DataMan/TiledShapeStMan.h>
36 37	#include <casacore/tables/DataMan/DataManError.h>
37 38	#include <casacore/casa/IO/ArrayIO.h>
38 39	#include <casacore/casa/System/ProgressMeter.h>
39 40
40 41	#include <casacore/casa/OS/RegularFile.h>
41 42	#include <casacore/casa/OS/Directory.h>
42 43	#include <casacore/casa/OS/SymLink.h>
43 44
44 45	#include <flagging/Flagging/SLog.h>

486 487	for(Int i=0;i<(Int)versionlist_p.nelements();i++)
487 488	{
488 489	if( ! versionlist_p[i].matches("main") )
489 490	{
490 491	if(versionlist_p[i].matches(versionname))
491 492	{
492 493	log->out(String("Deleting version: ") + versionname,
493 494	fnname, clname, LogMessage::WARN);
494 495
495 496	String tabvername = flagtablename_p + versionname;
496 -	Table tb;
497 -	if(tb.canDeleteTable(tabvername))
498 -	tb.deleteTable(tabvername);
497 +	if(TableUtil::canDeleteTable(tabvername))
498 +	TableUtil::deleteTable(tabvername);
499 499	}
500 500	else listfile << commentlist_p[i] << endl;
501 501	}
502 502	}
503 503	listfile.close();
504 504
505 505	readVersionList();
506 506
507 507	return true;
508 508	}