From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 8 Jul 2017 18:52:55 +0000 (+0200)
Subject: valadoc: Drop superfluous VALA_0_32 conditionals
X-Git-Tag: 0.37.2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3591ebadadd5255a1e4b8aed643635fb174eed54;p=thirdparty%2Fvala.git

valadoc: Drop superfluous VALA_0_32 conditionals

Fixes tests while bootstapping with valac < 0.31/32
---

diff --git a/valadoc/tests/drivers/api-test.data.vapi b/valadoc/tests/drivers/api-test.data.vapi
index 3c696f4af..4a3236502 100644
--- a/valadoc/tests/drivers/api-test.data.vapi
+++ b/valadoc/tests/drivers/api-test.data.vapi
@@ -132,7 +132,6 @@ namespace VersionTest {
 	[Experimental]
 	public void test_function_3 ();
 
-#if VALA_0_32
 	[Version (since = "2.0")]
 	public void test_function_4 ();
 	[Version (deprecated = true)]
@@ -145,7 +144,6 @@ namespace VersionTest {
 	public void test_function_8 ();
 	[Version (experimental = true)]
 	public void test_function_9 ();
-#endif
 }
 
 
diff --git a/valadoc/tests/drivers/generic-api-test.vala b/valadoc/tests/drivers/generic-api-test.vala
index 74ef7d899..bf71bfe31 100644
--- a/valadoc/tests/drivers/generic-api-test.vala
+++ b/valadoc/tests/drivers/generic-api-test.vala
@@ -2384,14 +2384,12 @@ public static void version_test (Api.Namespace ns, Api.Package pkg) {
 	bool func1 = false;
 	bool func2 = false;
 	bool func3 = false;
-#if VALA_0_32
 	bool func4 = false;
 	bool func5 = false;
 	bool func6 = false;
 	bool func7 = false;
 	bool func8 = false;
 	bool func9 = false;
-#endif
 
 	foreach (Api.Node node in methods) {
 		Api.Method m = node as Api.Method;
@@ -2448,7 +2446,6 @@ public static void version_test (Api.Namespace ns, Api.Package pkg) {
 			func3 = true;
 			break;
 
-#if VALA_0_32
 		case "test_function_4":
 			assert (m.get_attribute ("Version").get_argument ("since").get_value_as_string () == "\"2.0\"");
 			assert (m.is_deprecated == false);
@@ -2492,7 +2489,6 @@ public static void version_test (Api.Namespace ns, Api.Package pkg) {
 
 			func9 = true;
 			break;
-#endif
 
 		default:
 			assert_not_reached ();
@@ -2502,14 +2498,12 @@ public static void version_test (Api.Namespace ns, Api.Package pkg) {
 	assert (func1 == true);
 	assert (func2 == true);
 	assert (func3 == true);
-#if VALA_0_32
 	assert (func4 == true);
 	assert (func5 == true);
 	assert (func6 == true);
 	assert (func7 == true);
 	assert (func8 == true);
 	assert (func9 == true);
-#endif
 }