From: Lou Berger <lberger@labn.net>
Date: Tue, 10 Jul 2018 20:02:59 +0000 (-0400)
Subject: bgpd: remove VERSION_TYPE_DEV from CONFDATE checks
X-Git-Tag: frr-6.1-dev~156^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=bee57a7a07498c626ed6dad0cd8c66ec1d14367d;p=mirror%2Ffrr.git

bgpd: remove VERSION_TYPE_DEV from CONFDATE checks

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 641628d4b7..95dffe2698 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -772,7 +772,7 @@ static void bgp_clear_star_soft_out(struct vty *vty, const char *name)
 #endif
 
 /* BGP global configuration.  */
-#if defined(VERSION_TYPE_DEV) && (CONFDATE > 20190601)
+#if (CONFDATE > 20190601)
 CPP_NOTICE("bgpd: time to remove deprecated bgp multiple-instance")
 CPP_NOTICE("This includes BGP_OPT_MULTIPLE_INSTANCE")
 #endif
@@ -806,7 +806,7 @@ DEFUN_HIDDEN (no_bgp_multiple_instance,
 	return CMD_SUCCESS;
 }
 
-#if defined(VERSION_TYPE_DEV) && (CONFDATE > 20190601)
+#if (CONFDATE > 20190601)
 CPP_NOTICE("bgpd: time to remove deprecated cli bgp config-type cisco")
 CPP_NOTICE("This includes BGP_OPT_CISCO_CONFIG")
 #endif
@@ -2005,7 +2005,7 @@ DEFUN (no_bgp_fast_external_failover,
 }
 
 /* "bgp enforce-first-as" configuration. */
-#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180517
+#if CONFDATE > 20180517
 CPP_NOTICE("bgpd: remove deprecated '[no] bgp enforce-first-as' commands")
 #endif
 
@@ -9126,7 +9126,7 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, uint8_t use_json,
 			uptime -= p->uptime;
 			epoch_tbuf = time(NULL) - uptime;
 
-#if defined(VERSION_TYPE_DEV) && CONFDATE > 20200101
+#if CONFDATE > 20200101
 			CPP_NOTICE(
 				"bgpTimerUp should be deprecated and can be removed now");
 #endif
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index e5b269eb70..b5fb653bae 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -7356,7 +7356,7 @@ static void bgp_config_write_family(struct vty *vty, struct bgp *bgp, afi_t afi,
 }
 
 /* clang-format off */
-#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180517
+#if CONFDATE > 20180517
 CPP_NOTICE("bgpd: remove 'bgp enforce-first-as' config migration from bgp_config_write")
 #endif
 /* clang-format on */