From 40ec1d7a21fd3ee60cc99664d2d08d565edeb1d3 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Wed, 2 Nov 2022 17:14:48 -0700 Subject: [PATCH] Remove NS_DEPRECATED_3_35 methods --- src/core/model/deprecated.h | 7 ---- src/internet/model/ipv6-header.cc | 24 -------------- src/internet/model/ipv6-header.h | 32 ------------------- .../helper/ipv4-nix-vector-helper.h | 23 ------------- .../model/ipv4-nix-vector-routing.h | 24 -------------- 5 files changed, 110 deletions(-) delete mode 100644 src/nix-vector-routing/helper/ipv4-nix-vector-helper.h delete mode 100644 src/nix-vector-routing/model/ipv4-nix-vector-routing.h diff --git a/src/core/model/deprecated.h b/src/core/model/deprecated.h index c091556f5..d0cb303b8 100644 --- a/src/core/model/deprecated.h +++ b/src/core/model/deprecated.h @@ -86,11 +86,4 @@ */ #define NS_DEPRECATED_3_36(msg) NS_DEPRECATED(msg) -/** - * \ingroup core - * \def NS_DEPRECATED_3_35 - * Tag for things deprecated in version ns-3.35. - */ -#define NS_DEPRECATED_3_35 NS_DEPRECATED("") - #endif /* NS3_DEPRECATED_H */ diff --git a/src/internet/model/ipv6-header.cc b/src/internet/model/ipv6-header.cc index 901bba070..94f500e3a 100644 --- a/src/internet/model/ipv6-header.cc +++ b/src/internet/model/ipv6-header.cc @@ -108,48 +108,24 @@ Ipv6Header::SetSource(Ipv6Address src) m_sourceAddress = src; } -void -Ipv6Header::SetSourceAddress(Ipv6Address src) -{ - SetSource(src); -} - Ipv6Address Ipv6Header::GetSource() const { return m_sourceAddress; } -Ipv6Address -Ipv6Header::GetSourceAddress() const -{ - return GetSource(); -} - void Ipv6Header::SetDestination(Ipv6Address dst) { m_destinationAddress = dst; } -void -Ipv6Header::SetDestinationAddress(Ipv6Address dst) -{ - SetDestination(dst); -} - Ipv6Address Ipv6Header::GetDestination() const { return m_destinationAddress; } -Ipv6Address -Ipv6Header::GetDestinationAddress() const -{ - return GetDestination(); -} - TypeId Ipv6Header::GetTypeId() { diff --git a/src/internet/model/ipv6-header.h b/src/internet/model/ipv6-header.h index 8bcb8ad13..8f1dfc5df 100644 --- a/src/internet/model/ipv6-header.h +++ b/src/internet/model/ipv6-header.h @@ -228,56 +228,24 @@ class Ipv6Header : public Header */ void SetSource(Ipv6Address src); - /** - * \brief Set the "Source address" field. - * \deprecated Use SetSource () function instead (same functionality) - * \param src the source address - */ - NS_DEPRECATED_3_35 - void SetSourceAddress(Ipv6Address src); - /** * \brief Get the "Source address" field. * \return the source address */ Ipv6Address GetSource() const; - /** - * \brief Get the "Source address" field. - * \deprecated Use GetSource () function instead (same functionality) - * \return the source address - */ - NS_DEPRECATED_3_35 - Ipv6Address GetSourceAddress() const; - /** * \brief Set the "Destination address" field. * \param dst the destination address */ void SetDestination(Ipv6Address dst); - /** - * \brief Set the "Destination address" field. - * \deprecated Use SetDestination () function instead (same functionality) - * \param dst the destination address - */ - NS_DEPRECATED_3_35 - void SetDestinationAddress(Ipv6Address dst); - /** * \brief Get the "Destination address" field. * \return the destination address */ Ipv6Address GetDestination() const; - /** - * \brief Get the "Destination address" field. - * \deprecated Use GetDestination () function instead (same functionality) - * \return the destination address - */ - NS_DEPRECATED_3_35 - Ipv6Address GetDestinationAddress() const; - /** * \brief Print some information about the packet. * \param os output stream diff --git a/src/nix-vector-routing/helper/ipv4-nix-vector-helper.h b/src/nix-vector-routing/helper/ipv4-nix-vector-helper.h deleted file mode 100644 index 94e4afefe..000000000 --- a/src/nix-vector-routing/helper/ipv4-nix-vector-helper.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2021 NITK Surathkal - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * The purpose of this file is to have backwards compatibility with previous - * IPv4 Nix Vector Routing examples and usages. - * - * Authors: Ameya Deshpande - */ -#pragma GCC warning "NS_DEPRECATED_3_35 - Deprecated header, please use nix-vector-helper.h instead" -#include "nix-vector-helper.h" diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h deleted file mode 100644 index 9dd617fc5..000000000 --- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2021 NITK Surathkal - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * The purpose of this file is to have backwards compatibility with previous - * IPv4 Nix Vector Routing examples and usages. - * - * Authors: Ameya Deshpande - */ -#pragma GCC warning \ - "NS_DEPRECATED_3_35 - Deprecated header, please use nix-vector-routing.h instead" -#include "nix-vector-routing.h"