From: James P. T. <jpt...@us...> - 2012-10-12 20:08:17
|
Update of /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/AAFAnalyzer In directory vz-cvs-4.sog:/tmp/cvs-serv26409/AAFAnalyzer Modified Files: Tag: V116_branch AAFAnalyzerMain.cpp Log Message: resolve remaining boost tr1 conflicts in vc10 Index: AAFAnalyzerMain.cpp =================================================================== RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/AAFAnalyzer/AAFAnalyzerMain.cpp,v retrieving revision 1.44 retrieving revision 1.44.4.1 diff -C2 -d -r1.44 -r1.44.4.1 *** AAFAnalyzerMain.cpp 1 Jun 2009 11:46:44 -0000 1.44 --- AAFAnalyzerMain.cpp 12 Oct 2012 20:07:45 -0000 1.44.4.1 *************** *** 91,95 **** using namespace aafanalyzer; using namespace std; - using namespace boost; namespace fs = boost::filesystem; --- 91,94 ---- *************** *** 156,160 **** // function. ! void RecursiveOutputVerboseResultMsgs( shared_ptr<TestResult> res, unsigned int level, const wstring& filter, --- 155,159 ---- // function. ! void RecursiveOutputVerboseResultMsgs( boost::shared_ptr<TestResult> res, unsigned int level, const wstring& filter, *************** *** 173,179 **** if ( res->GetResultType() == TestResult::DETAIL ) { ! shared_ptr<DetailLevelTestResult> spDetailResult = dynamic_pointer_cast<DetailLevelTestResult>(res); assert( spDetailResult ); ! shared_ptr<Node> spNode = spDetailResult->GetAssociatedNode(); if ( spNode ) { --- 172,178 ---- if ( res->GetResultType() == TestResult::DETAIL ) { ! boost::shared_ptr<DetailLevelTestResult> spDetailResult = dynamic_pointer_cast<DetailLevelTestResult>(res); assert( spDetailResult ); ! boost::shared_ptr<Node> spNode = spDetailResult->GetAssociatedNode(); if ( spNode ) { *************** *** 242,246 **** ! void OutputVerboseResultMsgs( shared_ptr<TestResult> res, unsigned int level, const wstring& filter, --- 241,245 ---- ! void OutputVerboseResultMsgs( boost::shared_ptr<TestResult> res, unsigned int level, const wstring& filter, *************** *** 250,254 **** } ! void OutputVerboseResultMsgs( shared_ptr<TestResult> res, unsigned int level ) { --- 249,253 ---- } ! void OutputVerboseResultMsgs( boost::shared_ptr<TestResult> res, unsigned int level ) { *************** *** 257,261 **** } ! void OutputVerboseResultMsgs( shared_ptr<TestResult> res, unsigned int level, wstring filter ) --- 256,260 ---- } ! void OutputVerboseResultMsgs( boost::shared_ptr<TestResult> res, unsigned int level, wstring filter ) *************** *** 287,291 **** } ! void OutputFileCoverage(shared_ptr<const TestResult> res, const basic_string<wchar_t> fileName, unsigned int level) { wcout << "File Name: " << fileName << endl; --- 286,290 ---- } ! void OutputFileCoverage(boost::shared_ptr<const TestResult> res, const basic_string<wchar_t> fileName, unsigned int level) { wcout << "File Name: " << fileName << endl; *************** *** 342,346 **** } ! void CollectReasons( shared_ptr<const TestResult> res, const wstring& reqId, TestResult::Result result, --- 341,345 ---- } ! void CollectReasons( boost::shared_ptr<const TestResult> res, const wstring& reqId, TestResult::Result result, *************** *** 369,373 **** } ! void OutputReasons( shared_ptr<const TestResult> res, const wstring& reqId, TestResult::Result result ) --- 368,372 ---- } ! void OutputReasons( boost::shared_ptr<const TestResult> res, const wstring& reqId, TestResult::Result result ) *************** *** 383,387 **** } ! void OutputSimpleResultMsgs( shared_ptr<const TestResult> res ) { Requirement::RequirementMap::const_iterator iter; --- 382,386 ---- } ! void OutputSimpleResultMsgs( boost::shared_ptr<const TestResult> res ) { Requirement::RequirementMap::const_iterator iter; *************** *** 390,394 **** for ( iter = failures.begin(); iter != failures.end(); ++iter ) { ! shared_ptr<const Requirement> req = iter->second; wcout << "FAIL : " << req->GetId() << L", " << req->GetName() << endl; wcout << L"Desc : " << req->GetDescription() << endl; --- 389,393 ---- for ( iter = failures.begin(); iter != failures.end(); ++iter ) { ! boost::shared_ptr<const Requirement> req = iter->second; wcout << "FAIL : " << req->GetId() << L", " << req->GetName() << endl; wcout << L"Desc : " << req->GetDescription() << endl; *************** *** 408,412 **** for ( iter = warnings.begin(); iter != warnings.end(); iter++ ) { ! shared_ptr<const Requirement> req = iter->second; wcout << "WARN : " << req->GetId() << L", " << req->GetName() << endl; wcout << L"Desc : " << req->GetDescription() << endl; --- 407,411 ---- for ( iter = warnings.begin(); iter != warnings.end(); iter++ ) { ! boost::shared_ptr<const Requirement> req = iter->second; wcout << "WARN : " << req->GetId() << L", " << req->GetName() << endl; wcout << L"Desc : " << req->GetDescription() << endl; *************** *** 437,441 **** } ! void WriteXMLRequirements(shared_ptr<const TestResult> spTestResult, TestResult::Result result, set<wstring>& coveredReqIds, --- 436,440 ---- } ! void WriteXMLRequirements(boost::shared_ptr<const TestResult> spTestResult, TestResult::Result result, set<wstring>& coveredReqIds, *************** *** 445,449 **** for(Requirement::RequirementMap::const_iterator iter = reqMap.begin(); iter != reqMap.end(); ++iter) { ! shared_ptr<const Requirement> req = iter->second; coveredReqIds.erase(req->GetId()); set<wstring> reasonSet; --- 444,448 ---- for(Requirement::RequirementMap::const_iterator iter = reqMap.begin(); iter != reqMap.end(); ++iter) { ! boost::shared_ptr<const Requirement> req = iter->second; coveredReqIds.erase(req->GetId()); set<wstring> reasonSet; *************** *** 456,460 **** } ! void OutputXMLResults(shared_ptr<const TestResult> res, wostream& os) { os << "<aafanalyzer_results version=\"" << AAFANALYZER_VERSION << "\">" << endl; --- 455,459 ---- } ! void OutputXMLResults(boost::shared_ptr<const TestResult> res, wostream& os) { os << "<aafanalyzer_results version=\"" << AAFANALYZER_VERSION << "\">" << endl; *************** *** 464,468 **** for(Requirement::RequirementMap::const_iterator iter = coveredReqs.begin(); iter != coveredReqs.end(); ++iter) { ! shared_ptr<const Requirement> req = iter->second; coveredReqIds.insert(req->GetId()); } --- 463,467 ---- for(Requirement::RequirementMap::const_iterator iter = coveredReqs.begin(); iter != coveredReqs.end(); ++iter) { ! boost::shared_ptr<const Requirement> req = iter->second; coveredReqIds.insert(req->GetId()); } *************** *** 525,529 **** {} ! void operator()( pair<const AxString, shared_ptr<const Requirement> > entry ) { if ( _type == L"all" || --- 524,528 ---- {} ! void operator()( pair<const AxString, boost::shared_ptr<const Requirement> > entry ) { if ( _type == L"all" || *************** *** 556,560 **** {} ! void operator()( pair<const AxString, shared_ptr<const Requirement> > entry ) { if ( _type == L"all" || --- 555,559 ---- {} ! void operator()( pair<const AxString, boost::shared_ptr<const Requirement> > entry ) { if ( _type == L"all" || *************** *** 646,650 **** } ! void operator()( pair<const AxString, shared_ptr<const Requirement> > entry ) { static wstring stnd_stmnt --- 645,649 ---- } ! void operator()( pair<const AxString, boost::shared_ptr<const Requirement> > entry ) { static wstring stnd_stmnt *************** *** 847,851 **** // Dump option pair<bool,int> dumpArg = args.get( "-dump" ); ! pair<bool,const char*> dumpOption( false, 0 ); if ( dumpArg.first ) { --- 846,850 ---- // Dump option pair<bool,int> dumpArg = args.get( "-dump" ); ! pair<bool,const char*> dumpOption( false, reinterpret_cast<const char *>(0) ); if ( dumpArg.first ) { *************** *** 909,913 **** // Filter output by result name. pair<bool, int> filterByNameOpt = args.get( "-filter" ); ! pair<bool, const char*> filterByNameArg( false, 0 ); if ( filterByNameOpt.first ) { --- 908,912 ---- // Filter output by result name. pair<bool, int> filterByNameOpt = args.get( "-filter" ); ! pair<bool, const char*> filterByNameArg( false, reinterpret_cast<const char *>(0) ); if ( filterByNameOpt.first ) { *************** *** 921,925 **** // Requirements filename pair<bool,int> reqsArg = args.get( "-reqs" ); ! pair<bool, const char*> requirementsFile( false, 0 ); if ( reqsArg.first ) { --- 920,924 ---- // Requirements filename pair<bool,int> reqsArg = args.get( "-reqs" ); ! pair<bool, const char*> requirementsFile( false, reinterpret_cast<const char *>(0) ); if ( reqsArg.first ) { *************** *** 932,936 **** // AAF Filename is the last argument if requirements report not requested. ! pair<bool,const char*> fileNameArg(false,0); if ( !reportArg.first ) { --- 931,935 ---- // AAF Filename is the last argument if requirements report not requested. ! pair<bool,const char*> fileNameArg(false, reinterpret_cast<const char *>(0)); if ( !reportArg.first ) { *************** *** 1015,1019 **** // Create the result object. ! shared_ptr<TopLevelTestResult> spResult(new TopLevelTestResult()); spResult->SetName( L"AAF Analyzer" ); spResult->SetDescription( L"AAF Edit Protocol compliance test." ); --- 1014,1018 ---- // Create the result object. ! boost::shared_ptr<TopLevelTestResult> spResult(new TopLevelTestResult()); spResult->SetName( L"AAF Analyzer" ); spResult->SetDescription( L"AAF Edit Protocol compliance test." ); *************** *** 1021,1030 **** // First phase - load all objects and resolve references. LoadPhase load( wcerr, fileName ); ! shared_ptr<TestPhaseLevelTestResult> spSubResult( load.Execute() ); spResult->AppendSubtestResult(spSubResult); // Store the test graph info so the AAF file is not inadvertantley // closed. ! shared_ptr<const AAFGraphInfo> graphInfo = load.GetTestGraphInfo(); // The source references are resolved as part of the LoadPhase --- 1020,1029 ---- // First phase - load all objects and resolve references. LoadPhase load( wcerr, fileName ); ! boost::shared_ptr<TestPhaseLevelTestResult> spSubResult( load.Execute() ); spResult->AppendSubtestResult(spSubResult); // Store the test graph info so the AAF file is not inadvertantley // closed. ! boost::shared_ptr<const AAFGraphInfo> graphInfo = load.GetTestGraphInfo(); // The source references are resolved as part of the LoadPhase *************** *** 1032,1036 **** // tells us what the data structure looks like going into the more // detailed edit protocol (e.g. mob dependency) tests. ! vector<shared_ptr<Node> > roots = load.GetRoots(); if ( dumpArg.first ) { --- 1031,1035 ---- // tells us what the data structure looks like going into the more // detailed edit protocol (e.g. mob dependency) tests. ! vector<boost::shared_ptr<Node> > roots = load.GetRoots(); if ( dumpArg.first ) { |