fix latest ns-3-dev warnings and issues (#49)

MetalKnight · web-flow · commit 748bcc1dc7d1 · 2025-01-10T10:34:36.000+01:00
* fixed latest warnings and issues
* fixed example
* fixed woss test
* Update README.md
diff --git a/README.md b/README.md
@@ -15,20 +15,23 @@ WOSS can be integrated in any network simulator or simulation tool that supports
 
 Latest WOSS source code, installation instructions and related libraries can be found at https://woss.dei.unipd.it
 
-How to install 'woss-ns3' with *waf*:
+How to install 'woss-ns3' with *cmake*:
 - download and install the recommended Acoustic Toolbox library
 - with optional NetCDF support, download and install the recommended HDF5, NetCDF libraries, with NetCDF4 format support
 - download and install the latest WOSS library with optional NetCDF4 and HDF5 support
 - clone this repository in the `<ns3-dir>/src` path and then run one of the following:
-  - NetCDF4 and HDF5 support, *pay attention to the CXXFLAGS inline redefinition due to a unresolved NetCDF-C++4 API warning* `./waf configure
---with-woss-source=<woss_source_path> --with-woss-library=<woss_lib_path> --with-netcdf4-install=<netcdf4_and_hdf5_installed_path> CXXFLAGS="-Wall -Werror -Wno-unused-variable"`
-  - with no NetCDF support `./waf configure --with-woss-source=<woss_source_path> --with-woss-library=<woss_lib_path>`
-
-How to install 'woss-ns3' with *cmake*:
-- install the required libraries as in previous instructions
-- run one of the following:
-  - NetCDF4 and HDF5 support, *pay attention to the CXXFLAGS inline redefinition due to a unresolved NetCDF-C++4 API warning* `CXXFLAGS="-Wno-unused-variable" ./ns3 configure --enable-examples --enable-tests -- -DNS3_WITH_WOSS_SOURCE=/<woss_source_path> -DNS3_WITH_WOSS_LIBRARY=<woss_lib_path> -DNS3_WITH_NETCDF4_INSTALL=<netcdf4_and_hdf5_installed_path>`
+  - NetCDF4 and HDF5 support, *pay attention to the CXXFLAGS inline redefinition due to a unresolved NetCDF-C++4 API warning* `CXXFLAGS="-Wno-unused-variable" ./ns3 configure --enable-examples --enable-tests -- -DNS3_WITH_WOSS_SOURCE=<woss_source_path> -DNS3_WITH_WOSS_LIBRARY=<woss_lib_path> -DNS3_WITH_NETCDF4_INSTALL=<netcdf4_and_hdf5_installed_path>`
   - with no NetCDF support `CXXFLAGS="-Wno-unused-variable" ./ns3 configure --enable-examples --enable-tests -- -DNS3_WITH_WOSS_SOURCE=/<woss_source_path> -DNS3_WITH_WOSS_LIBRARY=<woss_lib_path>`
+- finally run `./ns3 build`
+
+How to install 'woss-ns3' with *waf* (**OBSOLETE**):
+- download and install the recommended Acoustic Toolbox library
+- with optional NetCDF support, download and install the recommended HDF5, NetCDF libraries, with NetCDF4 format support
+- download and install the latest WOSS library with optional NetCDF4 and HDF5 support
+- clone this repository in the `<ns3-dir>/src` path and then run one of the following:
+  - NetCDF4 and HDF5 support, *pay attention to the CXXFLAGS inline redefinition due to a unresolved NetCDF-C++4 API warning* `./waf configure --with-woss-source=<woss_source_path> --with-woss-library=<woss_lib_path> --with-netcdf4-install=<netcdf4_and_hdf5_installed_path> CXXFLAGS="-Wall -Werror -Wno-unused-variable"`
+  - with no NetCDF support `./waf configure --with-woss-source=<woss_source_path> --with-woss-library=<woss_lib_path>`
+- finally run `./waf build`
 
 For info on how to install all the required libraries with the suggested paths, please check https://woss.dei.unipd.it/woss/doxygen/installation.html
 
diff --git a/examples/woss-aloha-example.cc b/examples/woss-aloha-example.cc
@@ -247,7 +247,7 @@ Experiment::Run (uint32_t param)
 
   Ptr<Node> nodeSink = sink.Get (0);
   Ptr<WossWaypointMobilityModel> sinkMob = nodeSink->GetObject<WossWaypointMobilityModel> ();
-  NS_ASSERT (sinkMob != NULL);
+  NS_ASSERT (sinkMob != nullptr);
 
   for (int cnt = 0; cnt < 5; ++cnt)
     {
diff --git a/helper/woss-helper.cc b/helper/woss-helper.cc
@@ -187,18 +187,18 @@ WossHelper::WossHelper ()
     m_wossRandomGenStream (0),
     m_randomGenProto (),
     m_timeRefProto (),
-    m_defHandler (NULL),
+    m_defHandler (nullptr),
     m_resDbCreatorDebug (WH_DEBUG_DEFAULT),
     m_resDbDebug (WH_DEBUG_DEFAULT),
     m_resDbUseBinary (true),
     m_resDbUseTimeArr (true),
     m_resDbSpaceSampling (WH_SPACE_SAMPLING_DEFAULT),
     m_resDbFilePath (WH_STRING_DEFAULT),
     m_resDbFileName (WH_STRING_DEFAULT),
-    m_resDbCreatorPressBin (NULL),
-    m_resDbCreatorPressTxt (NULL),
-    m_resDbCreatorTimeArrBin (NULL),
-    m_resDbCreatorTimeArrTxt (NULL),
+    m_resDbCreatorPressBin (nullptr),
+    m_resDbCreatorPressTxt (nullptr),
+    m_resDbCreatorTimeArrBin (nullptr),
+    m_resDbCreatorTimeArrTxt (nullptr),
 #if defined (WOSS_NETCDF_SUPPORT)
     m_sedimDbCreatorDebug (WH_DEBUG_DEFAULT),
     m_sedimDbDebug (WH_DEBUG_DEFAULT),
@@ -208,22 +208,22 @@ WossHelper::WossHelper ()
     m_sedimDbCoordFilePath (WH_STRING_DEFAULT),
     m_sedimDbMarsdenFilePath (WH_STRING_DEFAULT),
     m_sedimDbMarsdenOneFilePath (WH_STRING_DEFAULT),
-    m_sedimDbCreator (NULL),
+    m_sedimDbCreator (nullptr),
     m_sspDbCreatorDebug (WH_DEBUG_DEFAULT),
     m_sspDbDebug (WH_DEBUG_DEFAULT),
     m_sspDbFilePath (WH_STRING_DEFAULT),
 #if defined (WOSS_NETCDF4_SUPPORT)
     m_sspWoaDbType (WH_WOA_DB_TYPE_DEFAULT),
 #endif // defined (WOSS_NETCDF_SUPPORT)
-    m_sspDbCreator (NULL),
+    m_sspDbCreator (nullptr),
     m_bathyDbCreatorDebug (WH_DEBUG_DEFAULT),
     m_bathyDbDebug (WH_DEBUG_DEFAULT),
     m_bathyDbGebcoFormat(WH_GEBCO_FORMAT_DEFAULT),
     m_bathyDbFilePath (WH_STRING_DEFAULT),
-    m_bathyDbCreator (NULL),
+    m_bathyDbCreator (nullptr),
 #endif // defined (WOSS_NETCDF_SUPPORT)
     m_wossDbManagerDebug (WH_DEBUG_DEFAULT),
-    m_wossDbManager (NULL),
+    m_wossDbManager (nullptr),
     m_wossCreatorDebug (WH_DEBUG_DEFAULT),
     m_wossDebug (WH_DEBUG_DEFAULT),
     m_wossClearWorkDir (true),
@@ -255,18 +255,18 @@ WossHelper::WossHelper ()
     m_bellhopArrSyntax (WH_BELLHOP_ARR_SYNTAX_DEFAULT),
     m_bellhopShdSyntax (WH_BELLHOP_SHD_SYNTAX_DEFAULT),
     m_simTime (),
-    m_bellhopCreator (NULL),
+    m_bellhopCreator (nullptr),
     m_boxDepth (WH_BOX_DEPTH),
     m_boxRange (WH_BOX_RANGE),
     m_wossManagerDebug (WH_DEBUG_DEFAULT),
     m_isTimeEvolutionActive (false),
     m_concurrentThreads (WH_CONCURRENT_THREADS_DEFAULT),
     m_wossManagerSpaceSampling (WH_SPACE_SAMPLING_DEFAULT),
     m_wossManagerUseMultiThread (false),
-    m_wossManagerSimple (NULL),
-    m_wossManagerMulti (NULL),
+    m_wossManagerSimple (nullptr),
+    m_wossManagerMulti (nullptr),
     m_wossTransducerHndlDebug (WH_DEBUG_DEFAULT),
-    m_wossTransducerHndl (NULL),
+    m_wossTransducerHndl (nullptr),
     m_wossControllerDebug (WH_DEBUG_DEFAULT),
     m_wossController (),
     m_initialized (false)
@@ -287,69 +287,69 @@ WossHelper::DoDispose (void)
 
   DeleteWossLocationMap ();
 
-  if (m_wossManagerSimple != NULL)
+  if (m_wossManagerSimple != nullptr)
     {
       delete m_wossManagerSimple;
     }
 
-  if (m_wossManagerMulti != NULL)
+  if (m_wossManagerMulti != nullptr)
     {
       delete m_wossManagerMulti;
     }
 
-  if (m_wossTransducerHndl != NULL)
+  if (m_wossTransducerHndl != nullptr)
     {
       delete m_wossTransducerHndl;
     }
 
-  if (m_bellhopCreator != NULL)
+  if (m_bellhopCreator != nullptr)
     {
       delete m_bellhopCreator;
     }
 
-  if (m_wossDbManager != NULL)
+  if (m_wossDbManager != nullptr)
     {
       delete m_wossDbManager;
     }
 
 #if defined (WOSS_NETCDF_SUPPORT)
-  if (m_bathyDbCreator != NULL)
+  if (m_bathyDbCreator != nullptr)
     {
       delete m_bathyDbCreator;
     }
 
-  if (m_sspDbCreator != NULL)
+  if (m_sspDbCreator != nullptr)
     {
       delete m_sspDbCreator;
     }
 
-  if (m_sedimDbCreator != NULL)
+  if (m_sedimDbCreator != nullptr)
     {
       delete m_sedimDbCreator;
     }
 #endif // defined (WOSS_NETCDF_SUPPORT)
 
-  if (m_resDbCreatorPressBin != NULL)
+  if (m_resDbCreatorPressBin != nullptr)
     {
       delete m_resDbCreatorPressBin;
     }
 
-  if (m_resDbCreatorPressTxt != NULL)
+  if (m_resDbCreatorPressTxt != nullptr)
     {
       delete m_resDbCreatorPressTxt;
     }
 
-  if (m_resDbCreatorTimeArrBin != NULL)
+  if (m_resDbCreatorTimeArrBin != nullptr)
     {
       delete m_resDbCreatorTimeArrBin;
     }
 
-  if (m_resDbCreatorTimeArrTxt != NULL)
+  if (m_resDbCreatorTimeArrTxt != nullptr)
     {
       delete m_resDbCreatorTimeArrTxt;
     }
 
-  if (m_wossController != NULL)
+  if (m_wossController != nullptr)
     {
       delete m_wossController;
     }
@@ -605,7 +605,7 @@ WossHelper::GetWossLocation ( Ptr< MobilityModel > ptr )
 {
   NS_LOG_FUNCTION (this << ptr);
 
-  WossLocation* retValue = NULL;
+  WossLocation* retValue = nullptr;
 
   MLMCIter it = m_locMap.find (PeekPointer (ptr));
 
@@ -630,7 +630,7 @@ WossHelper::DeleteWossLocationMap (void)
 {
   for ( MLMCIter it = m_locMap.begin (); it != m_locMap.end (); ++it )
     {
-      if (it->second != NULL)
+      if (it->second != nullptr)
         {
           delete it->second;
         }
@@ -673,9 +673,9 @@ WossHelper::SetAngles ( const woss::CustomAngles& angles, Ptr<MobilityModel> tx,
 {
   CheckInitialized ();
 
-  if ( tx == NULL )
+  if ( tx == nullptr )
     {
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           m_bellhopCreator->setAngles (angles);
         }
@@ -689,7 +689,7 @@ WossHelper::SetAngles ( const woss::CustomAngles& angles, Ptr<MobilityModel> tx,
     {
       WossLocation* txLoc = GetWossLocation ( tx );
 
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           m_bellhopCreator->eraseAngles ( txLoc );
         }
@@ -709,9 +709,9 @@ WossHelper::GetAngles ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx ) const
 {
   CheckInitialized ();
 
-  if ( tx == NULL )
+  if ( tx == nullptr )
     {
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           return m_bellhopCreator->getAngles ();
         }
@@ -725,7 +725,7 @@ WossHelper::GetAngles ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx ) const
     {
       WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );
 
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           return m_bellhopCreator->getAngles ( txLoc );
         }
@@ -743,9 +743,9 @@ WossHelper::EraseAngles ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx )
 {
   CheckInitialized ();
 
-  if ( tx == NULL )
+  if ( tx == nullptr )
     {
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           m_bellhopCreator->eraseAngles ();
         }
@@ -759,7 +759,7 @@ WossHelper::EraseAngles ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx )
     {
       WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );
 
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           m_bellhopCreator->eraseAngles ( txLoc );
         }
@@ -838,9 +838,9 @@ WossHelper::SetCustomTransducer ( const woss::CustomTransducer& type, Ptr<Mobili
 {
   CheckInitialized ();
 
-  if ( tx == NULL )
+  if ( tx == nullptr )
     {
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           m_bellhopCreator->setCustomTransducer (type);
         }
@@ -854,7 +854,7 @@ WossHelper::SetCustomTransducer ( const woss::CustomTransducer& type, Ptr<Mobili
     {
       WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );
 
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           m_bellhopCreator->setCustomTransducer ( type, txLoc );
         }
@@ -874,9 +874,9 @@ WossHelper::GetCustomTransducer ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx )
 {
   CheckInitialized ();
 
-  if ( tx == NULL )
+  if ( tx == nullptr )
     {
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           return m_bellhopCreator->getCustomTransducer ();
         }
@@ -890,7 +890,7 @@ WossHelper::GetCustomTransducer ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx )
     {
       WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );
 
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           return m_bellhopCreator->getCustomTransducer ( txLoc );
         }
@@ -908,9 +908,9 @@ WossHelper::EraseCustomTransducer ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx
 {
   CheckInitialized ();
 
-  if ( tx == NULL )
+  if ( tx == nullptr )
     {
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           m_bellhopCreator->eraseCustomTransducer ();
         }
@@ -924,7 +924,7 @@ WossHelper::EraseCustomTransducer ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx
     {
       WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );
 
-      if ( rx == NULL )
+      if ( rx == nullptr )
         {
           m_bellhopCreator->eraseCustomTransducer ( txLoc );
         }
@@ -1286,7 +1286,7 @@ WossHelper::CreateDirectory (const ::std::string& path)
 
   NS_LOG_DEBUG ("WossHelper::CreateDirectory () command = " << command);
 
-  if (system (NULL))
+  if (system (nullptr))
     {
       ret_value = system (command.c_str ());
     }
diff --git a/model/woss-channel.cc b/model/woss-channel.cc
@@ -71,7 +71,7 @@ WossChannel::WossChannel ()
   : UanChannel (),
     m_channelEqSnrThresDb (WOSS_CHANNEL_SNR_EQ_THRES_DB),
     // -infinite snr ==> first tap
-    m_wossPropModel (NULL)
+    m_wossPropModel (nullptr)
 {
 }
 
@@ -87,7 +87,7 @@ WossChannel::DoInitialize (void)
 
   m_wossPropModel = DynamicCast< WossPropModel > ( m_prop );
 
-  NS_ASSERT ( m_wossPropModel != NULL );
+  NS_ASSERT ( m_wossPropModel != nullptr );
 
   UanChannel::DoInitialize ();
 }
diff --git a/model/woss-position-allocator.cc b/model/woss-position-allocator.cc
@@ -113,7 +113,7 @@ WossGridPositionAllocator::GetTypeId (void)
                    MakeDoubleChecker<double> ())
     .AddAttribute ("LayoutType", "The type of layout.",
                    EnumValue (ROW_FIRST),
-                   MakeEnumAccessor (&WossGridPositionAllocator::m_layoutType),
+                   MakeEnumAccessor<LayoutType> (&WossGridPositionAllocator::m_layoutType),
                    MakeEnumChecker (ROW_FIRST, "RowFirst",
                                     COLUMN_FIRST, "ColumnFirst"))
   ;
diff --git a/test/woss-test.cc b/test/woss-test.cc

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ Experiment::Run (uint32_t param)`
`247`	`247`
`248`	`248`	`Ptr<Node> nodeSink = sink.Get (0);`
`249`	`249`	`Ptr<WossWaypointMobilityModel> sinkMob = nodeSink->GetObject<WossWaypointMobilityModel> ();`
`250`		`- NS_ASSERT (sinkMob != NULL);`
	`250`	`+ NS_ASSERT (sinkMob != nullptr);`
`251`	`251`
`252`	`252`	`for (int cnt = 0; cnt < 5; ++cnt)`
`253`	`253`	`{`
Original file line number	Diff line number	Diff line change
`@@ -187,18 +187,18 @@ WossHelper::WossHelper ()`
`187`	`187`	`m_wossRandomGenStream (0),`
`188`	`188`	`m_randomGenProto (),`
`189`	`189`	`m_timeRefProto (),`
`190`		`- m_defHandler (NULL),`
	`190`	`+ m_defHandler (nullptr),`
`191`	`191`	`m_resDbCreatorDebug (WH_DEBUG_DEFAULT),`
`192`	`192`	`m_resDbDebug (WH_DEBUG_DEFAULT),`
`193`	`193`	`m_resDbUseBinary (true),`
`194`	`194`	`m_resDbUseTimeArr (true),`
`195`	`195`	`m_resDbSpaceSampling (WH_SPACE_SAMPLING_DEFAULT),`
`196`	`196`	`m_resDbFilePath (WH_STRING_DEFAULT),`
`197`	`197`	`m_resDbFileName (WH_STRING_DEFAULT),`
`198`		`- m_resDbCreatorPressBin (NULL),`
`199`		`- m_resDbCreatorPressTxt (NULL),`
`200`		`- m_resDbCreatorTimeArrBin (NULL),`
`201`		`- m_resDbCreatorTimeArrTxt (NULL),`
	`198`	`+ m_resDbCreatorPressBin (nullptr),`
	`199`	`+ m_resDbCreatorPressTxt (nullptr),`
	`200`	`+ m_resDbCreatorTimeArrBin (nullptr),`
	`201`	`+ m_resDbCreatorTimeArrTxt (nullptr),`
`202`	`202`	`#if defined (WOSS_NETCDF_SUPPORT)`
`203`	`203`	`m_sedimDbCreatorDebug (WH_DEBUG_DEFAULT),`
`204`	`204`	`m_sedimDbDebug (WH_DEBUG_DEFAULT),`
`@@ -208,22 +208,22 @@ WossHelper::WossHelper ()`
`208`	`208`	`m_sedimDbCoordFilePath (WH_STRING_DEFAULT),`
`209`	`209`	`m_sedimDbMarsdenFilePath (WH_STRING_DEFAULT),`
`210`	`210`	`m_sedimDbMarsdenOneFilePath (WH_STRING_DEFAULT),`
`211`		`- m_sedimDbCreator (NULL),`
	`211`	`+ m_sedimDbCreator (nullptr),`
`212`	`212`	`m_sspDbCreatorDebug (WH_DEBUG_DEFAULT),`
`213`	`213`	`m_sspDbDebug (WH_DEBUG_DEFAULT),`
`214`	`214`	`m_sspDbFilePath (WH_STRING_DEFAULT),`
`215`	`215`	`#if defined (WOSS_NETCDF4_SUPPORT)`
`216`	`216`	`m_sspWoaDbType (WH_WOA_DB_TYPE_DEFAULT),`
`217`	`217`	`#endif // defined (WOSS_NETCDF_SUPPORT)`
`218`		`- m_sspDbCreator (NULL),`
	`218`	`+ m_sspDbCreator (nullptr),`
`219`	`219`	`m_bathyDbCreatorDebug (WH_DEBUG_DEFAULT),`
`220`	`220`	`m_bathyDbDebug (WH_DEBUG_DEFAULT),`
`221`	`221`	`m_bathyDbGebcoFormat(WH_GEBCO_FORMAT_DEFAULT),`
`222`	`222`	`m_bathyDbFilePath (WH_STRING_DEFAULT),`
`223`		`- m_bathyDbCreator (NULL),`
	`223`	`+ m_bathyDbCreator (nullptr),`
`224`	`224`	`#endif // defined (WOSS_NETCDF_SUPPORT)`
`225`	`225`	`m_wossDbManagerDebug (WH_DEBUG_DEFAULT),`
`226`		`- m_wossDbManager (NULL),`
	`226`	`+ m_wossDbManager (nullptr),`
`227`	`227`	`m_wossCreatorDebug (WH_DEBUG_DEFAULT),`
`228`	`228`	`m_wossDebug (WH_DEBUG_DEFAULT),`
`229`	`229`	`m_wossClearWorkDir (true),`
`@@ -255,18 +255,18 @@ WossHelper::WossHelper ()`
`255`	`255`	`m_bellhopArrSyntax (WH_BELLHOP_ARR_SYNTAX_DEFAULT),`
`256`	`256`	`m_bellhopShdSyntax (WH_BELLHOP_SHD_SYNTAX_DEFAULT),`
`257`	`257`	`m_simTime (),`
`258`		`- m_bellhopCreator (NULL),`
	`258`	`+ m_bellhopCreator (nullptr),`
`259`	`259`	`m_boxDepth (WH_BOX_DEPTH),`
`260`	`260`	`m_boxRange (WH_BOX_RANGE),`
`261`	`261`	`m_wossManagerDebug (WH_DEBUG_DEFAULT),`
`262`	`262`	`m_isTimeEvolutionActive (false),`
`263`	`263`	`m_concurrentThreads (WH_CONCURRENT_THREADS_DEFAULT),`
`264`	`264`	`m_wossManagerSpaceSampling (WH_SPACE_SAMPLING_DEFAULT),`
`265`	`265`	`m_wossManagerUseMultiThread (false),`
`266`		`- m_wossManagerSimple (NULL),`
`267`		`- m_wossManagerMulti (NULL),`
	`266`	`+ m_wossManagerSimple (nullptr),`
	`267`	`+ m_wossManagerMulti (nullptr),`
`268`	`268`	`m_wossTransducerHndlDebug (WH_DEBUG_DEFAULT),`
`269`		`- m_wossTransducerHndl (NULL),`
	`269`	`+ m_wossTransducerHndl (nullptr),`
`270`	`270`	`m_wossControllerDebug (WH_DEBUG_DEFAULT),`
`271`	`271`	`m_wossController (),`
`272`	`272`	`m_initialized (false)`
`@@ -287,69 +287,69 @@ WossHelper::DoDispose (void)`
`287`	`287`
`288`	`288`	`DeleteWossLocationMap ();`
`289`	`289`
`290`		`- if (m_wossManagerSimple != NULL)`
	`290`	`+ if (m_wossManagerSimple != nullptr)`
`291`	`291`	`{`
`292`	`292`	`delete m_wossManagerSimple;`
`293`	`293`	`}`
`294`	`294`
`295`		`- if (m_wossManagerMulti != NULL)`
	`295`	`+ if (m_wossManagerMulti != nullptr)`
`296`	`296`	`{`
`297`	`297`	`delete m_wossManagerMulti;`
`298`	`298`	`}`
`299`	`299`
`300`		`- if (m_wossTransducerHndl != NULL)`
	`300`	`+ if (m_wossTransducerHndl != nullptr)`
`301`	`301`	`{`
`302`	`302`	`delete m_wossTransducerHndl;`
`303`	`303`	`}`
`304`	`304`
`305`		`- if (m_bellhopCreator != NULL)`
	`305`	`+ if (m_bellhopCreator != nullptr)`
`306`	`306`	`{`
`307`	`307`	`delete m_bellhopCreator;`
`308`	`308`	`}`
`309`	`309`
`310`		`- if (m_wossDbManager != NULL)`
	`310`	`+ if (m_wossDbManager != nullptr)`
`311`	`311`	`{`
`312`	`312`	`delete m_wossDbManager;`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`#if defined (WOSS_NETCDF_SUPPORT)`
`316`		`- if (m_bathyDbCreator != NULL)`
	`316`	`+ if (m_bathyDbCreator != nullptr)`
`317`	`317`	`{`
`318`	`318`	`delete m_bathyDbCreator;`
`319`	`319`	`}`
`320`	`320`
`321`		`- if (m_sspDbCreator != NULL)`
	`321`	`+ if (m_sspDbCreator != nullptr)`
`322`	`322`	`{`
`323`	`323`	`delete m_sspDbCreator;`
`324`	`324`	`}`
`325`	`325`
`326`		`- if (m_sedimDbCreator != NULL)`
	`326`	`+ if (m_sedimDbCreator != nullptr)`
`327`	`327`	`{`
`328`	`328`	`delete m_sedimDbCreator;`
`329`	`329`	`}`
`330`	`330`	`#endif // defined (WOSS_NETCDF_SUPPORT)`
`331`	`331`
`332`		`- if (m_resDbCreatorPressBin != NULL)`
	`332`	`+ if (m_resDbCreatorPressBin != nullptr)`
`333`	`333`	`{`
`334`	`334`	`delete m_resDbCreatorPressBin;`
`335`	`335`	`}`
`336`	`336`
`337`		`- if (m_resDbCreatorPressTxt != NULL)`
	`337`	`+ if (m_resDbCreatorPressTxt != nullptr)`
`338`	`338`	`{`
`339`	`339`	`delete m_resDbCreatorPressTxt;`
`340`	`340`	`}`
`341`	`341`
`342`		`- if (m_resDbCreatorTimeArrBin != NULL)`
	`342`	`+ if (m_resDbCreatorTimeArrBin != nullptr)`
`343`	`343`	`{`
`344`	`344`	`delete m_resDbCreatorTimeArrBin;`
`345`	`345`	`}`
`346`	`346`
`347`		`- if (m_resDbCreatorTimeArrTxt != NULL)`
	`347`	`+ if (m_resDbCreatorTimeArrTxt != nullptr)`
`348`	`348`	`{`
`349`	`349`	`delete m_resDbCreatorTimeArrTxt;`
`350`	`350`	`}`
`351`	`351`
`352`		`- if (m_wossController != NULL)`
	`352`	`+ if (m_wossController != nullptr)`
`353`	`353`	`{`
`354`	`354`	`delete m_wossController;`
`355`	`355`	`}`
`@@ -605,7 +605,7 @@ WossHelper::GetWossLocation ( Ptr< MobilityModel > ptr )`
`605`	`605`	`{`
`606`	`606`	`NS_LOG_FUNCTION (this << ptr);`
`607`	`607`
`608`		`- WossLocation* retValue = NULL;`
	`608`	`+ WossLocation* retValue = nullptr;`
`609`	`609`
`610`	`610`	`MLMCIter it = m_locMap.find (PeekPointer (ptr));`
`611`	`611`
`@@ -630,7 +630,7 @@ WossHelper::DeleteWossLocationMap (void)`
`630`	`630`	`{`
`631`	`631`	`for ( MLMCIter it = m_locMap.begin (); it != m_locMap.end (); ++it )`
`632`	`632`	`{`
`633`		`- if (it->second != NULL)`
	`633`	`+ if (it->second != nullptr)`
`634`	`634`	`{`
`635`	`635`	`delete it->second;`
`636`	`636`	`}`
`@@ -673,9 +673,9 @@ WossHelper::SetAngles ( const woss::CustomAngles& angles, Ptr<MobilityModel> tx,`
`673`	`673`	`{`
`674`	`674`	`CheckInitialized ();`
`675`	`675`
`676`		`- if ( tx == NULL )`
	`676`	`+ if ( tx == nullptr )`
`677`	`677`	`{`
`678`		`- if ( rx == NULL )`
	`678`	`+ if ( rx == nullptr )`
`679`	`679`	`{`
`680`	`680`	`m_bellhopCreator->setAngles (angles);`
`681`	`681`	`}`
`@@ -689,7 +689,7 @@ WossHelper::SetAngles ( const woss::CustomAngles& angles, Ptr<MobilityModel> tx,`
`689`	`689`	`{`
`690`	`690`	`WossLocation* txLoc = GetWossLocation ( tx );`
`691`	`691`
`692`		`- if ( rx == NULL )`
	`692`	`+ if ( rx == nullptr )`
`693`	`693`	`{`
`694`	`694`	`m_bellhopCreator->eraseAngles ( txLoc );`
`695`	`695`	`}`
`@@ -709,9 +709,9 @@ WossHelper::GetAngles ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx ) const`
`709`	`709`	`{`
`710`	`710`	`CheckInitialized ();`
`711`	`711`
`712`		`- if ( tx == NULL )`
	`712`	`+ if ( tx == nullptr )`
`713`	`713`	`{`
`714`		`- if ( rx == NULL )`
	`714`	`+ if ( rx == nullptr )`
`715`	`715`	`{`
`716`	`716`	`return m_bellhopCreator->getAngles ();`
`717`	`717`	`}`
`@@ -725,7 +725,7 @@ WossHelper::GetAngles ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx ) const`
`725`	`725`	`{`
`726`	`726`	`WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );`
`727`	`727`
`728`		`- if ( rx == NULL )`
	`728`	`+ if ( rx == nullptr )`
`729`	`729`	`{`
`730`	`730`	`return m_bellhopCreator->getAngles ( txLoc );`
`731`	`731`	`}`
`@@ -743,9 +743,9 @@ WossHelper::EraseAngles ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx )`
`743`	`743`	`{`
`744`	`744`	`CheckInitialized ();`
`745`	`745`
`746`		`- if ( tx == NULL )`
	`746`	`+ if ( tx == nullptr )`
`747`	`747`	`{`
`748`		`- if ( rx == NULL )`
	`748`	`+ if ( rx == nullptr )`
`749`	`749`	`{`
`750`	`750`	`m_bellhopCreator->eraseAngles ();`
`751`	`751`	`}`
`@@ -759,7 +759,7 @@ WossHelper::EraseAngles ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx )`
`759`	`759`	`{`
`760`	`760`	`WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );`
`761`	`761`
`762`		`- if ( rx == NULL )`
	`762`	`+ if ( rx == nullptr )`
`763`	`763`	`{`
`764`	`764`	`m_bellhopCreator->eraseAngles ( txLoc );`
`765`	`765`	`}`
`@@ -838,9 +838,9 @@ WossHelper::SetCustomTransducer ( const woss::CustomTransducer& type, Ptr<Mobili`
`838`	`838`	`{`
`839`	`839`	`CheckInitialized ();`
`840`	`840`
`841`		`- if ( tx == NULL )`
	`841`	`+ if ( tx == nullptr )`
`842`	`842`	`{`
`843`		`- if ( rx == NULL )`
	`843`	`+ if ( rx == nullptr )`
`844`	`844`	`{`
`845`	`845`	`m_bellhopCreator->setCustomTransducer (type);`
`846`	`846`	`}`
`@@ -854,7 +854,7 @@ WossHelper::SetCustomTransducer ( const woss::CustomTransducer& type, Ptr<Mobili`
`854`	`854`	`{`
`855`	`855`	`WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );`
`856`	`856`
`857`		`- if ( rx == NULL )`
	`857`	`+ if ( rx == nullptr )`
`858`	`858`	`{`
`859`	`859`	`m_bellhopCreator->setCustomTransducer ( type, txLoc );`
`860`	`860`	`}`
`@@ -874,9 +874,9 @@ WossHelper::GetCustomTransducer ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx )`
`874`	`874`	`{`
`875`	`875`	`CheckInitialized ();`
`876`	`876`
`877`		`- if ( tx == NULL )`
	`877`	`+ if ( tx == nullptr )`
`878`	`878`	`{`
`879`		`- if ( rx == NULL )`
	`879`	`+ if ( rx == nullptr )`
`880`	`880`	`{`
`881`	`881`	`return m_bellhopCreator->getCustomTransducer ();`
`882`	`882`	`}`
`@@ -890,7 +890,7 @@ WossHelper::GetCustomTransducer ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx )`
`890`	`890`	`{`
`891`	`891`	`WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );`
`892`	`892`
`893`		`- if ( rx == NULL )`
	`893`	`+ if ( rx == nullptr )`
`894`	`894`	`{`
`895`	`895`	`return m_bellhopCreator->getCustomTransducer ( txLoc );`
`896`	`896`	`}`
`@@ -908,9 +908,9 @@ WossHelper::EraseCustomTransducer ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx`
`908`	`908`	`{`
`909`	`909`	`CheckInitialized ();`
`910`	`910`
`911`		`- if ( tx == NULL )`
	`911`	`+ if ( tx == nullptr )`
`912`	`912`	`{`
`913`		`- if ( rx == NULL )`
	`913`	`+ if ( rx == nullptr )`
`914`	`914`	`{`
`915`	`915`	`m_bellhopCreator->eraseCustomTransducer ();`
`916`	`916`	`}`
`@@ -924,7 +924,7 @@ WossHelper::EraseCustomTransducer ( Ptr<MobilityModel> tx, Ptr<MobilityModel> rx`
`924`	`924`	`{`
`925`	`925`	`WossLocation* txLoc = const_cast<WossHelper*> (this)->GetWossLocation ( tx );`
`926`	`926`
`927`		`- if ( rx == NULL )`
	`927`	`+ if ( rx == nullptr )`
`928`	`928`	`{`
`929`	`929`	`m_bellhopCreator->eraseCustomTransducer ( txLoc );`
`930`	`930`	`}`
`@@ -1286,7 +1286,7 @@ WossHelper::CreateDirectory (const ::std::string& path)`
`1286`	`1286`
`1287`	`1287`	`NS_LOG_DEBUG ("WossHelper::CreateDirectory () command = " << command);`
`1288`	`1288`
`1289`		`- if (system (NULL))`
	`1289`	`+ if (system (nullptr))`
`1290`	`1290`	`{`
`1291`	`1291`	`ret_value = system (command.c_str ());`
`1292`	`1292`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ WossChannel::WossChannel ()`
`71`	`71`	`: UanChannel (),`
`72`	`72`	`m_channelEqSnrThresDb (WOSS_CHANNEL_SNR_EQ_THRES_DB),`
`73`	`73`	`// -infinite snr ==> first tap`
`74`		`- m_wossPropModel (NULL)`
	`74`	`+ m_wossPropModel (nullptr)`
`75`	`75`	`{`
`76`	`76`	`}`
`77`	`77`
`@@ -87,7 +87,7 @@ WossChannel::DoInitialize (void)`
`87`	`87`
`88`	`88`	`m_wossPropModel = DynamicCast< WossPropModel > ( m_prop );`
`89`	`89`
`90`		`- NS_ASSERT ( m_wossPropModel != NULL );`
	`90`	`+ NS_ASSERT ( m_wossPropModel != nullptr );`
`91`	`91`
`92`	`92`	`UanChannel::DoInitialize ();`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ WossGridPositionAllocator::GetTypeId (void)`
`113`	`113`	`MakeDoubleChecker<double> ())`
`114`	`114`	`.AddAttribute ("LayoutType", "The type of layout.",`
`115`	`115`	`EnumValue (ROW_FIRST),`
`116`		`- MakeEnumAccessor (&WossGridPositionAllocator::m_layoutType),`
	`116`	`+ MakeEnumAccessor<LayoutType> (&WossGridPositionAllocator::m_layoutType),`
`117`	`117`	`MakeEnumChecker (ROW_FIRST, "RowFirst",`
`118`	`118`	`COLUMN_FIRST, "ColumnFirst"))`
`119`	`119`	`;`