Merge branch 'pseyfert-histdoc'

cmake/modules/CTestCustom.cmake

@@ -21,7 +21,8 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION}
         "function is dangerous and should not be used"           # deprecated use of std functions cint/ROOT
     )
 set(CTEST_CUSTOM_ERROR_EXCEPTION ${CTEST_CUSTOM_ERROR_EXCEPTION}
-        "fatal error: cannot open file")
+        "fatal error: cannot open file"
+        "remark: ")
 
 #---Include other CTest Custom files----------------------------------------
 if(DEFINED CTEST_BINARY_DIRECTORY)

core/metacling/src/ClingRAII.h

@@ -20,6 +20,27 @@ namespace ROOT {
     ////////////////////////////////////////////////////////////////////////////////
     /// RAII used to store Parser, Sema, Preprocessor state for recursive parsing.
     struct ParsingStateRAII {
+       struct SemaExprCleanupsRAII {
+          decltype(clang::Sema::Cleanup) fCleanup;
+          decltype(clang::Sema::ExprCleanupObjects) fExprCleanupObjects;
+          decltype(clang::Sema::MaybeODRUseExprs) fMaybeODRUseExprs;
+          decltype(clang::Sema::FunctionScopes) fFunctionScopes;
+          clang::Sema& fSema;
+          void Swapem() {
+             std::swap(fCleanup, fSema.Cleanup);
+             std::swap(fExprCleanupObjects, fSema.ExprCleanupObjects);
+             std::swap(fMaybeODRUseExprs, fSema.MaybeODRUseExprs);
+             std::swap(fFunctionScopes, fSema.FunctionScopes);
+          }
+          SemaExprCleanupsRAII(clang::Sema& S): fSema(S) {
+             fFunctionScopes.push_back(new clang::sema::FunctionScopeInfo(S.Diags));
+             Swapem();
+          };
+          ~SemaExprCleanupsRAII() {
+             Swapem();
+          }
+       };
+
        struct SemaParsingInitForAutoVarsRAII {
           using PIFAV_t = decltype(clang::Sema::ParsingInitForAutoVars);
           PIFAV_t& fSemaPIFAV;
@@ -39,6 +60,8 @@ namespace ROOT {
        // Buffer the delayed infos when doing recursive parsing.
        clang::Sema::DelayedInfoRAII fSemaInfoRAII;
 
+       SemaExprCleanupsRAII fSemaExprCleanupsRAII;
+
        // We can't PushDeclContext, because we go up and the routine that pops
        // the DeclContext assumes that we drill down always.
        // We have to be on the global context. At that point we are in a
@@ -51,7 +74,7 @@ namespace ROOT {
           fCleanupRAII(sema.getPreprocessor()),
           fSavedCurToken(parser),
           fParserRAII(parser, false /*skipToEOF*/),
-          fSemaInfoRAII(sema),
+          fSemaInfoRAII(sema), fSemaExprCleanupsRAII(sema),
           fPushedDCAndS(sema, sema.getASTContext().getTranslationUnitDecl(),
                         sema.TUScope),
           fSemaParsingInitForAutoVarsRAII(sema.ParsingInitForAutoVars)
@@ -64,4 +87,4 @@ namespace ROOT {
     };
 
 }
-}
\ No newline at end of file
+}

tutorials/hist/histpalettecolor.C

@@ -41,11 +41,11 @@ void histpalettecolor()
       h5->Fill(px, 2.);
    }
 
-   h1->SetMarkerStyle(20);
-   h2->SetMarkerStyle(21);
-   h3->SetMarkerStyle(22);
-   h4->SetMarkerStyle(23);
-   h5->SetMarkerStyle(24);
+   h1->SetMarkerStyle(kFullCircle);
+   h2->SetMarkerStyle(kFullSquare);
+   h3->SetMarkerStyle(kFullTriangleUp);
+   h4->SetMarkerStyle(kFullTriangleDown);
+   h5->SetMarkerStyle(kOpenCircle);
 
    h1->Draw("PLC PMC");
    h2->Draw("SAME PLC PMC");