Updates for MACOS compilation (virtual destructors and variable types)

src/lte/examples/lena-first-sim.cc

@@ -23,7 +23,7 @@
 #include "ns3/network-module.h"
 #include "ns3/mobility-module.h"
 #include "ns3/lte-module.h"
-#include "ns3/gtk-config-store.h"
+//#include "ns3/gtk-config-store.h"
 using namespace ns3;
 
 int main (int argc, char *argv[])
@@ -66,8 +66,8 @@ int main (int argc, char *argv[])
 
   Simulator::Run ();
 
-  GtkConfigStore config;
-  config.ConfigureAttributes ();
+  //GtkConfigStore config;
+  //config.ConfigureAttributes ();
 
   Simulator::Destroy ();
   return 0;

src/lte/examples/lena-rlc-calculator.cc

@@ -26,7 +26,7 @@
 #include "ns3/rlc-stats-calculator.h"
 
 
-#include "ns3/gtk-config-store.h"
+//#include "ns3/gtk-config-store.h"
 
 using namespace ns3;
 

src/lte/model/lte-enb-cmac-sap.cc

@@ -0,0 +1,36 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ *
+ * 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
+ *
+ * Author: Marco Miozzo <mmiozzo@cttc.es>
+ */
+
+
+#include "lte-enb-cmac-sap.h"
+
+
+namespace ns3 {
+
+
+LteEnbCmacSapProvider::~LteEnbCmacSapProvider ()
+{
+}
+
+LteEnbCmacSapUser::~LteEnbCmacSapUser ()
+{
+}
+
+} // namespace ns3

src/lte/model/lte-enb-cmac-sap.h

@@ -39,6 +39,7 @@ class LteMacSapUser;
 class LteEnbCmacSapProvider
 {
 public:
+  virtual ~LteEnbCmacSapProvider ();
   /**
    *
    *
@@ -108,6 +109,7 @@ public:
 class LteEnbCmacSapUser
 {
 public:
+  virtual ~LteEnbCmacSapUser ();
   /**
    * notify the result of the last LC config operation
    *

src/lte/model/lte-mac-sap.cc

@@ -29,4 +29,8 @@ LteMacSapProvider::~LteMacSapProvider ()
 {
 }
 
+LteMacSapUser::~LteMacSapUser ()
+{
+}
+
 } // namespace ns3

src/lte/model/lte-mac-sap.h

@@ -92,6 +92,7 @@ public:
 class LteMacSapUser
 {
 public:
+  virtual ~LteMacSapUser ();
   /**
    * Called by the MAC to notify the RLC that the scheduler granted a
    * transmission opportunity to this RLC instance.

src/lte/model/lte-sinr-chunk-processor.cc

@@ -27,6 +27,11 @@ NS_LOG_COMPONENT_DEFINE ("LteSinrChunkProcessor");
 
 namespace ns3 {
 
+LteSinrChunkProcessor::~LteSinrChunkProcessor ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
 
 LteCqiSinrChunkProcessor::LteCqiSinrChunkProcessor (Ptr<LtePhy> p)
   : m_phy (p)
@@ -35,6 +40,13 @@ LteCqiSinrChunkProcessor::LteCqiSinrChunkProcessor (Ptr<LtePhy> p)
   NS_ASSERT (m_phy);
 }
 
+
+LteCqiSinrChunkProcessor::~LteCqiSinrChunkProcessor ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
+
 void 
 LteCqiSinrChunkProcessor::Start ()
 {  

src/lte/model/lte-sinr-chunk-processor.h

@@ -42,6 +42,7 @@ namespace ns3 {
 class LteSinrChunkProcessor : public SimpleRefCount<LteSinrChunkProcessor> 
 {
 public:
+  virtual ~LteSinrChunkProcessor ();
   virtual void Start () = 0;
   virtual void EvaluateSinrChunk (const SpectrumValue& sinr, Time duration) = 0;
   virtual void End () = 0;
@@ -57,6 +58,7 @@ public:
 class LteCqiSinrChunkProcessor : public LteSinrChunkProcessor
 {
 public:
+  virtual ~LteCqiSinrChunkProcessor ();
   LteCqiSinrChunkProcessor (Ptr<LtePhy> p);
   virtual void Start ();
   virtual void EvaluateSinrChunk (const SpectrumValue& sinr, Time duration);

src/lte/model/lte-ue-cmac-sap.cc

@@ -0,0 +1,36 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
+ *
+ * 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
+ *
+ * Author: Marco Miozzo <mmiozzo@cttc.es>
+ */
+
+
+#include "lte-ue-cmac-sap.h"
+
+
+namespace ns3 {
+
+
+LteUeCmacSapProvider::~LteUeCmacSapProvider ()
+{
+}
+
+LteUeCmacSapUser::~LteUeCmacSapUser ()
+{
+}
+
+} // namespace ns3

src/lte/model/lte-ue-cmac-sap.h

@@ -39,6 +39,7 @@ class LteMacSapUser;
 class LteUeCmacSapProvider
 {
 public:
+  virtual ~LteUeCmacSapProvider ();
   /**
    * called by the RRC after going to RRC connected
    *
@@ -62,6 +63,7 @@ public:
 class LteUeCmacSapUser
 {
 public:
+  virtual ~LteUeCmacSapUser ();
   virtual void LcConfigCompleted () = 0;
 };
 

src/lte/model/pf-ff-mac-scheduler.cc

@@ -289,7 +289,7 @@ PfFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::Csch
   NS_LOG_FUNCTION (this << " New LC, rnti: "  << params.m_rnti);
   
   std::map <pfsFlowId_t, pfsFlowPerf_t>::iterator it;
-  for (uint i = 0; i < params.m_logicalChannelConfigList.size (); i++)
+  for (uint16_t i = 0; i < params.m_logicalChannelConfigList.size (); i++)
     {
       pfsFlowId_t flow;
       flow.m_rnti = params.m_rnti;

src/lte/wscript

@@ -32,6 +32,8 @@ def build(bld):
         'model/ff-mac-sched-sap.cc',
         'model/lte-mac-sap.cc',
         'model/ff-mac-scheduler.cc',
+        'model/lte-enb-cmac-sap.cc',
+        'model/lte-ue-cmac-sap.cc',
         'model/rr-ff-mac-scheduler.cc',
         'model/lte-enb-mac.cc',
         'model/lte-ue-mac.cc',