https://github.com/jsji updated https://github.com/llvm/llvm-project/pull/112814
>From d37014d8da13a3de36a7aaa0ed9a6f72c72d155d Mon Sep 17 00:00:00 2001
From: Jinsong Ji <jinsong...@intel.com>
Date: Fri, 18 Oct 2024 04:56:17 +0200
Subject: [PATCH 1/2] [NFC] Fix c++ style comment in c file
This is one of the many PRs to fix errors with LLVM_ENABLE_WERROR=on. Built by
GCC 11.
Fix warnings:
llvm-project/clang/include/clang-c/Index.h:2983:3: error: C++ style comments
are not allowed in ISO C90 [-Werror]
2983 | // HLSL Types
---
clang/include/clang-c/Index.h | 2 +-
clang/tools/c-index-test/c-index-test.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.h
index 4f99bf4ebe309b..0c5ac80772e2b9 100644
--- a/clang/include/clang-c/Index.h
+++ b/clang/include/clang-c/Index.h
@@ -2980,7 +2980,7 @@ enum CXTypeKind {
CXType_Atomic = 177,
CXType_BTFTagAttributed = 178,
- // HLSL Types
+ /* HLSL Types */
CXType_HLSLResource = 179,
CXType_HLSLAttributedResource = 180
};
diff --git a/clang/tools/c-index-test/c-index-test.c
b/clang/tools/c-index-test/c-index-test.c
index b48f44950ab754..7995203c0925a4 100644
--- a/clang/tools/c-index-test/c-index-test.c
+++ b/clang/tools/c-index-test/c-index-test.c
@@ -8,7 +8,6 @@
#include "clang-c/Documentation.h"
#include "clang-c/Index.h"
#include "clang/Config/config.h"
-#include "llvm/Support/AutoConvert.h"
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
>From d72d0e3d31ec0569a2e8e35df2bbae469bbb1b27 Mon Sep 17 00:00:00 2001
From: Jinsong Ji <jinsong...@intel.com>
Date: Fri, 18 Oct 2024 08:53:31 -0700
Subject: [PATCH 2/2] convert to c style
---
clang/tools/c-index-test/c-index-test.c | 1 +
llvm/include/llvm/Support/AutoConvert.h | 33 +++++++++++++------------
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/clang/tools/c-index-test/c-index-test.c
b/clang/tools/c-index-test/c-index-test.c
index 7995203c0925a4..b48f44950ab754 100644
--- a/clang/tools/c-index-test/c-index-test.c
+++ b/clang/tools/c-index-test/c-index-test.c
@@ -8,6 +8,7 @@
#include "clang-c/Documentation.h"
#include "clang-c/Index.h"
#include "clang/Config/config.h"
+#include "llvm/Support/AutoConvert.h"
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
diff --git a/llvm/include/llvm/Support/AutoConvert.h
b/llvm/include/llvm/Support/AutoConvert.h
index 6f45c4683f7775..554ca7a924500d 100644
--- a/llvm/include/llvm/Support/AutoConvert.h
+++ b/llvm/include/llvm/Support/AutoConvert.h
@@ -1,4 +1,4 @@
-//===- AutoConvert.h - Auto conversion between ASCII/EBCDIC -----*- C++
-*-===//
+/*===- AutoConvert.h - Auto conversion between ASCII/EBCDIC -----*- C++
-*-===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
@@ -9,7 +9,7 @@
// This file contains functions used for auto conversion between
// ASCII/EBCDIC codepages specific to z/OS.
//
-//===----------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===*/
#ifndef LLVM_SUPPORT_AUTOCONVERT_H
#define LLVM_SUPPORT_AUTOCONVERT_H
@@ -18,7 +18,7 @@
#include <_Ccsid.h>
#ifdef __cplusplus
#include <system_error>
-#endif // __cplusplus
+#endif /* __cplusplus */
#define CCSID_IBM_1047 1047
#define CCSID_UTF_8 1208
@@ -26,35 +26,36 @@
#ifdef __cplusplus
extern "C" {
-#endif // __cplusplus
+#endif /* __cplusplus */
int enablezOSAutoConversion(int FD);
int disablezOSAutoConversion(int FD);
int restorezOSStdHandleAutoConversion(int FD);
#ifdef __cplusplus
}
-#endif // __cplusplus
+#endif /* __cplusplus */
#ifdef __cplusplus
namespace llvm {
-/// \brief Disable the z/OS enhanced ASCII auto-conversion for the file
-/// descriptor.
+/** \brief Disable the z/OS enhanced ASCII auto-conversion for the file
+ * descriptor.
+ */
std::error_code disablezOSAutoConversion(int FD);
-/// \brief Query the z/OS enhanced ASCII auto-conversion status of a file
-/// descriptor and force the conversion if the file is not tagged with a
-/// codepage.
+/** \brief Query the z/OS enhanced ASCII auto-conversion status of a file
+ * descriptor and force the conversion if the file is not tagged with a
+ */ codepage.
std::error_code enablezOSAutoConversion(int FD);
-/// Restore the z/OS enhanced ASCII auto-conversion for the std handle.
+/** Restore the z/OS enhanced ASCII auto-conversion for the std handle. */
std::error_code restorezOSStdHandleAutoConversion(int FD);
-/// \brief Set the tag information for a file descriptor.
+/** \brief Set the tag information for a file descriptor. */
std::error_code setzOSFileTag(int FD, int CCSID, bool Text);
-} // namespace llvm
-#endif // __cplusplus
+} /* namespace llvm */
+#endif /* __cplusplus */
-#endif // __MVS__
+#endif /* __MVS__ */
-#endif // LLVM_SUPPORT_AUTOCONVERT_H
+#endif /* LLVM_SUPPORT_AUTOCONVERT_H */
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
