[med-svn] [Git][med-team/castxml][upstream] New upstream version 0.6.11

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch upstream at Debian Med / castxml


Commits:
6f1ed96a by Étienne Mollier at 2025-02-15T18:58:08+01:00
New upstream version 0.6.11
- - - - -


6 changed files:

- README.rst
- src/Output.cxx
- src/RunClang.cxx
- src/Version.cmake
- test/expect/cmd.predefined-macros.stdout.txt.in
- test/input/CXXLiteral.cxx


Changes:

=====================================
README.rst
=====================================
@@ -47,7 +47,8 @@ To build CastXML from source, first obtain the prerequisites:
 * `LLVM/Clang`_ compiler SDK install tree built using the C++ compiler.
   This version of CastXML has been tested with LLVM/Clang
 
-  - Git ``main`` as of 2024-10-10 (``545e0593f8``)
+  - Git ``master`` as of 2025-02-10 (``36530414e3``)
+  - Git ``release/20.x`` as of 2025-02-10 (``75e20e0b80``)
   - Release ``19.1``
   - Release ``18.1``
   - Release ``17.0``


=====================================
src/Output.cxx
=====================================
@@ -2197,7 +2197,11 @@ void ASTVisitor::OutputFieldDecl(clang::FieldDecl const* d, DumpNode const* dn)
   this->PrintNameAttribute(d->getName().str());
   this->PrintTypeAttribute(d->getType(), dn->Complete);
   if (d->isBitField()) {
-    unsigned bits = d->getBitWidthValue(this->CTX);
+    unsigned bits = d->getBitWidthValue(
+#if LLVM_VERSION_MAJOR < 20
+      this->CTX
+#endif
+    );
     this->OS << " bits=\"" << bits << "\"";
   }
   if (this->Opts.CastXml && !this->IsCastXMLTypedefType(d->getType())) {


=====================================
src/RunClang.cxx
=====================================
@@ -51,6 +51,10 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
 
+#if LLVM_VERSION_MAJOR >= 20
+#  include "llvm/Support/VirtualFileSystem.h"
+#endif
+
 #include <cstdlib>
 #include <fstream>
 #include <iostream>
@@ -738,7 +742,11 @@ static bool isObjC(clang::CompilerInstance* CI)
 static bool runClangCI(clang::CompilerInstance* CI, Options const& opts)
 {
   // Create a diagnostics engine for this compiler instance.
-  CI->createDiagnostics();
+  CI->createDiagnostics(
+#if LLVM_VERSION_MAJOR >= 20
+    *llvm::vfs::getRealFileSystem()
+#endif
+  );
   if (!CI->hasDiagnostics()) {
     return false;
   }
@@ -809,7 +817,11 @@ runClangCreateDiagnostics(const char* const* argBeg, const char* const* argEnd)
     new clang::TextDiagnosticPrinter(llvm::errs(), &*diagOpts);
   llvm::IntrusiveRefCntPtr<clang::DiagnosticsEngine> diags(
     new clang::DiagnosticsEngine(diagID, &*diagOpts, diagClient));
-  clang::ProcessWarningOptions(*diags, *diagOpts, /*ReportDiags=*/false);
+  clang::ProcessWarningOptions(*diags, *diagOpts,
+#if LLVM_VERSION_MAJOR >= 20
+                               *llvm::vfs::getRealFileSystem(),
+#endif
+                               /*ReportDiags=*/false);
   return diags;
 }
 


=====================================
src/Version.cmake
=====================================
@@ -1,7 +1,7 @@
 # CastXML version number components.
 set(CastXML_VERSION_MAJOR 0)
 set(CastXML_VERSION_MINOR 6)
-set(CastXML_VERSION_PATCH 10)
+set(CastXML_VERSION_PATCH 11)
 #set(CastXML_VERSION_RC 0)
 set(CastXML_VERSION_IS_DIRTY 0)
 
@@ -13,7 +13,7 @@ if(DEFINED CastXML_VERSION_RC)
 endif()
 
 # If this source was exported by 'git archive', use its commit info.
-set(git_info "02934d8 CastXML 0.6.10")
+set(git_info "f38c024 CastXML 0.6.11")
 
 # Otherwise, try to identify the current development source version.
 if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* "


=====================================
test/expect/cmd.predefined-macros.stdout.txt.in
=====================================
@@ -5,7 +5,9 @@
 #define __castxml_clang_patchlevel__ [0-9]+
 #define __castxml_major__ @CastXML_VERSION_MAJOR@
 #define __castxml_minor__ @CastXML_VERSION_MINOR@
-#define __castxml_patch__ @CastXML_VERSION_PATCH@
+#define __castxml_patch__ @CastXML_VERSION_PATCH@(
+#define __cdecl [^
+]*)?
 #define __clang__ 1(
 #define __clang_literal_encoding__ [^
 ]*)?


=====================================
test/input/CXXLiteral.cxx
=====================================
@@ -1,3 +1,3 @@
 namespace start {
-unsigned long long operator"" _u(unsigned long long);
+unsigned long long operator""_u(unsigned long long);
 }



View it on GitLab: https://salsa.debian.org/med-team/castxml/-/commit/6f1ed96ae93d1f60119013bdface35fb16cd65eb

-- 
View it on GitLab: https://salsa.debian.org/med-team/castxml/-/commit/6f1ed96ae93d1f60119013bdface35fb16cd65eb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20250215/6847b54c/attachment-0001.htm>