--- a/src/lte/examples/lena-first-sim.cc Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/examples/lena-first-sim.cc Tue Mar 29 15:24:42 2011 +0200
@@ -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 @@
Simulator::Run ();
- GtkConfigStore config;
- config.ConfigureAttributes ();
+ //GtkConfigStore config;
+ //config.ConfigureAttributes ();
Simulator::Destroy ();
return 0;
--- a/src/lte/examples/lena-rlc-calculator.cc Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/examples/lena-rlc-calculator.cc Tue Mar 29 15:24:42 2011 +0200
@@ -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;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lte/model/lte-enb-cmac-sap.cc Tue Mar 29 15:24:42 2011 +0200
@@ -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
--- a/src/lte/model/lte-enb-cmac-sap.h Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/model/lte-enb-cmac-sap.h Tue Mar 29 15:24:42 2011 +0200
@@ -39,6 +39,7 @@
class LteEnbCmacSapProvider
{
public:
+ virtual ~LteEnbCmacSapProvider ();
/**
*
*
@@ -108,6 +109,7 @@
class LteEnbCmacSapUser
{
public:
+ virtual ~LteEnbCmacSapUser ();
/**
* notify the result of the last LC config operation
*
--- a/src/lte/model/lte-mac-sap.cc Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/model/lte-mac-sap.cc Tue Mar 29 15:24:42 2011 +0200
@@ -29,4 +29,8 @@
{
}
+LteMacSapUser::~LteMacSapUser ()
+{
+}
+
} // namespace ns3
--- a/src/lte/model/lte-mac-sap.h Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/model/lte-mac-sap.h Tue Mar 29 15:24:42 2011 +0200
@@ -92,6 +92,7 @@
class LteMacSapUser
{
public:
+ virtual ~LteMacSapUser ();
/**
* Called by the MAC to notify the RLC that the scheduler granted a
* transmission opportunity to this RLC instance.
--- a/src/lte/model/lte-sinr-chunk-processor.cc Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/model/lte-sinr-chunk-processor.cc Tue Mar 29 15:24:42 2011 +0200
@@ -27,6 +27,11 @@
namespace ns3 {
+LteSinrChunkProcessor::~LteSinrChunkProcessor ()
+{
+ NS_LOG_FUNCTION (this);
+}
+
LteCqiSinrChunkProcessor::LteCqiSinrChunkProcessor (Ptr<LtePhy> p)
: m_phy (p)
@@ -35,6 +40,13 @@
NS_ASSERT (m_phy);
}
+
+LteCqiSinrChunkProcessor::~LteCqiSinrChunkProcessor ()
+{
+ NS_LOG_FUNCTION (this);
+}
+
+
void
LteCqiSinrChunkProcessor::Start ()
{
--- a/src/lte/model/lte-sinr-chunk-processor.h Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/model/lte-sinr-chunk-processor.h Tue Mar 29 15:24:42 2011 +0200
@@ -42,6 +42,7 @@
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 @@
class LteCqiSinrChunkProcessor : public LteSinrChunkProcessor
{
public:
+ virtual ~LteCqiSinrChunkProcessor ();
LteCqiSinrChunkProcessor (Ptr<LtePhy> p);
virtual void Start ();
virtual void EvaluateSinrChunk (const SpectrumValue& sinr, Time duration);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lte/model/lte-ue-cmac-sap.cc Tue Mar 29 15:24:42 2011 +0200
@@ -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
\ No newline at end of file
--- a/src/lte/model/lte-ue-cmac-sap.h Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/model/lte-ue-cmac-sap.h Tue Mar 29 15:24:42 2011 +0200
@@ -39,6 +39,7 @@
class LteUeCmacSapProvider
{
public:
+ virtual ~LteUeCmacSapProvider ();
/**
* called by the RRC after going to RRC connected
*
@@ -62,6 +63,7 @@
class LteUeCmacSapUser
{
public:
+ virtual ~LteUeCmacSapUser ();
virtual void LcConfigCompleted () = 0;
};
--- a/src/lte/model/pf-ff-mac-scheduler.cc Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/model/pf-ff-mac-scheduler.cc Tue Mar 29 15:24:42 2011 +0200
@@ -289,7 +289,7 @@
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;
--- a/src/lte/wscript Thu Mar 24 11:09:47 2011 +0100
+++ b/src/lte/wscript Tue Mar 29 15:24:42 2011 +0200
@@ -32,6 +32,8 @@
'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',