Update clang format to get correct merge compares (#5253)

This commit is contained in:
Allen Byrne authored and GitHub committed 2025-01-21 12:48:08 -06:00
1 parent 25fe253b7d
commit abe633d0a0
81 files changed
+486 -477

No files matched your search

+1 -2
View File
@@ -28,5 +28,4 @@ import org.junit.runners.Suite;
TestH5Obasic.class, TestH5Ocopy.class, TestH5Ocreate.class, TestH5PL.class,
TestH5Z.class})
public class TestAll {
}
public class TestAll {}
+2 -2
View File
@@ -939,8 +939,8 @@ public class TestH5D {
public void testH5Dvlen_get_buf_size()
{
String[] str_data = {"Parting", "is such", "sweet", "sorrow.", "Testing", "one", "two", "three.",
"Dog,", "man's", "best", "friend.", "Diamonds", "are", "a", "girls!",
"S A", "T U R", "D A Y", "night", "That's", "all", "folks", "!!!"};
"Dog,", "man's", "best", "friend.", "Diamonds", "are", "a", "girls!",
"S A", "T U R", "D A Y", "night", "That's", "all", "folks", "!!!"};
long vl_size = -1; /* Number of bytes used */
long str_data_bytes = 0;
for (int idx = 0; idx < str_data.length; idx++)
+2 -2
View File
@@ -45,8 +45,8 @@ public class TestH5F {
private static final int[] OBJ_COUNTS = {COUNT_OBJ_FILE, COUNT_OBJ_DATASET, COUNT_OBJ_GROUP,
COUNT_OBJ_DATATYPE, COUNT_OBJ_ATTR, COUNT_OBJ_ALL};
private static final int[] OBJ_TYPES = {HDF5Constants.H5F_OBJ_FILE, HDF5Constants.H5F_OBJ_DATASET,
HDF5Constants.H5F_OBJ_GROUP, HDF5Constants.H5F_OBJ_DATATYPE,
HDF5Constants.H5F_OBJ_ATTR, HDF5Constants.H5F_OBJ_ALL};
HDF5Constants.H5F_OBJ_GROUP, HDF5Constants.H5F_OBJ_DATATYPE,
HDF5Constants.H5F_OBJ_ATTR, HDF5Constants.H5F_OBJ_ALL};
long H5fid = HDF5Constants.H5I_INVALID_HID;
private final void _deleteFile(String filename)
+1 -1
View File
@@ -37,7 +37,7 @@ public class TestH5G {
private static final String H5_FILE = "testG.h5";
private static final String H5_FILE2 = "testG2.h5";
private static final String[] GROUPS = {"/G1", "/G1/G11", "/G1/G12", "/G1/G11/G111",
"/G1/G11/G112", "/G1/G11/G113", "/G1/G11/G114"};
"/G1/G11/G112", "/G1/G11/G113", "/G1/G11/G114"};
private static final String[] GROUPS2 = {"/G1", "/G1/G14", "/G1/G12", "/G1/G13", "/G1/G11"};
long H5fid = HDF5Constants.H5I_INVALID_HID;
long H5fid2 = HDF5Constants.H5I_INVALID_HID;
+1 -1
View File
@@ -73,7 +73,7 @@ public class TestH5Plist {
private static final String PROP3_NAME = "Property 3";
private static final char[] prop3_def = {'T', 'e', 'n', ' ', 'c',
'h', 'a', 'r', 's', ' '}; // Property 3 default value
'h', 'a', 'r', 's', ' '}; // Property 3 default value
private static final int PROP3_SIZE = 10;
private static final String PROP4_NAME = "Property 4";