>From 87b59dc7b4017eefe7bc8dbb3b035a05b42db765 Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Tue, 31 Dec 2019 19:38:50 +0100
Subject: [PATCH 3/3] uchar: Add C++ tests.

* tests/test-uchar-c++.cc: New file.
* tests/test-uchar-c++2.cc: New file.
* modules/uchar-c++-tests: New file.
---
 ChangeLog                |  5 +++++
 modules/uchar-c++-tests  | 18 ++++++++++++++++++
 tests/test-uchar-c++.cc  | 28 ++++++++++++++++++++++++++++
 tests/test-uchar-c++2.cc | 24 ++++++++++++++++++++++++
 4 files changed, 75 insertions(+)
 create mode 100644 modules/uchar-c++-tests
 create mode 100644 tests/test-uchar-c++.cc
 create mode 100644 tests/test-uchar-c++2.cc

diff --git a/ChangeLog b/ChangeLog
index 6d501b8..f503efe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2019-12-31  Bruno Haible  <address@hidden>
 
+	uchar: Add C++ tests.
+	* tests/test-uchar-c++.cc: New file.
+	* tests/test-uchar-c++2.cc: New file.
+	* modules/uchar-c++-tests: New file.
+
 	uchar: Add tests.
 	* tests/test-uchar.c: New file.
 	* modules/uchar-tests: New file.
diff --git a/modules/uchar-c++-tests b/modules/uchar-c++-tests
new file mode 100644
index 0000000..8fb7463
--- /dev/null
+++ b/modules/uchar-c++-tests
@@ -0,0 +1,18 @@
+Files:
+tests/test-uchar-c++.cc
+tests/test-uchar-c++2.cc
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-uchar-c++
+check_PROGRAMS += test-uchar-c++
+test_uchar_c___SOURCES = test-uchar-c++.cc test-uchar-c++2.cc
+endif
diff --git a/tests/test-uchar-c++.cc b/tests/test-uchar-c++.cc
new file mode 100644
index 0000000..9b5d8eb
--- /dev/null
+++ b/tests/test-uchar-c++.cc
@@ -0,0 +1,28 @@
+/* Test of <uchar.h> substitute in C++ mode.
+   Copyright (C) 2019 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <address@hidden>, 2019.  */
+
+#define GNULIB_NAMESPACE gnulib
+#include <config.h>
+
+#include <uchar.h>
+
+
+int
+main ()
+{
+}
diff --git a/tests/test-uchar-c++2.cc b/tests/test-uchar-c++2.cc
new file mode 100644
index 0000000..80a5d44
--- /dev/null
+++ b/tests/test-uchar-c++2.cc
@@ -0,0 +1,24 @@
+/* Test of <uchar.h> substitute in C++ mode.
+   Copyright (C) 2019 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define GNULIB_NAMESPACE gnulib
+#include <config.h>
+
+#if __cplusplus >= 201103
+
+# include <cuchar>
+
+#endif
-- 
2.7.4