Remove code deprecated in ns-3.40

Author: edalm

doc/doxygen.conf

@@ -2304,8 +2304,7 @@ EXPAND_AS_DEFINED      = ATTRIBUTE_ACCESSOR_DEFINE \
                          NS_DEPRECATED_3_44 \
                          NS_DEPRECATED_3_43 \
                          NS_DEPRECATED_3_42 \
-                         NS_DEPRECATED_3_41 \
-                         NS_DEPRECATED_3_40
+                         NS_DEPRECATED_3_41
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have

src/core/model/deprecated.h

@@ -125,11 +125,4 @@
  */
 #define NS_DEPRECATED_3_41(msg) NS_DEPRECATED("Deprecated in ns-3.41: " msg)
 
-/**
- * @ingroup deprecation
- * @def NS_DEPRECATED_3_40
- * Tag for things deprecated in version ns-3.40.
- */
-#define NS_DEPRECATED_3_40(msg) NS_DEPRECATED("Deprecated in ns-3.40: " msg)
-
 #endif /* NS3_DEPRECATED_H */

src/energy/CMakeLists.txt

@@ -17,7 +17,6 @@ build_lib(
     model/energy-harvester.cc
     model/energy-source.cc
     model/generic-battery-model.cc
-    model/li-ion-energy-source.cc
     model/rv-battery-model.cc
     model/simple-device-energy-model.cc
   HEADER_FILES
@@ -37,10 +36,8 @@ build_lib(
     model/energy-harvester.h
     model/energy-source.h
     model/generic-battery-model.h
-    model/li-ion-energy-source.h
     model/rv-battery-model.h
     model/simple-device-energy-model.h
   LIBRARIES_TO_LINK ${libnetwork}
   TEST_SOURCES test/basic-energy-harvester-test.cc
-               test/li-ion-energy-source-test.cc
 )

src/energy/examples/CMakeLists.txt

@@ -17,13 +17,6 @@ build_lib_example(
     ${libwifi}
 )
 
-build_lib_example(
-  NAME li-ion-energy-source-example
-  SOURCE_FILES li-ion-energy-source-example.cc
-  LIBRARIES_TO_LINK ${libcore}
-                    ${libenergy}
-)
-
 build_lib_example(
   NAME rv-battery-model-test
   SOURCE_FILES rv-battery-model-test.cc