From ae52ff16f6965946175ff166d30909443df9e42e Mon Sep 17 00:00:00 2001
From: Manuel Requena <manuel.requena@cttc.es>
Date: Mon, 16 Jan 2012 11:24:25 +0100
Subject: [PATCH 1/2] Merge-bug-fix: Some includes were removed in the wscript

---
 src/lte/wscript | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lte/wscript b/src/lte/wscript
index 7a11c0509..0271f724a 100644
--- a/src/lte/wscript
+++ b/src/lte/wscript
@@ -161,6 +161,9 @@ def build(bld):
         'test/lte-test-phy-error-model.h',
         'test/lte-test-pathloss-model.h',
         'test/epc-test-gtpu.h',
+        'test/lte-test-entities.h',
+        'test/lte-test-rlc-um-transmitter.h',
+        'test/lte-test-rlc-am-transmitter.h',
         'model/epc-tft.h',
         'model/epc-tft-classifier.h',
         'model/lte-mi-error-model.h'

From e7d401fcb938ed31440904305d3a88b039617440 Mon Sep 17 00:00:00 2001
From: Jaume Nin <unknown>
Date: Mon, 16 Jan 2012 11:40:15 +0100
Subject: [PATCH 2/2] Fixed compilation bug for gcc 4.4.3

---
 src/lte/helper/mac-stats-calculator.cc | 28 ++++++++++++++++++++++++--
 src/lte/helper/mac-stats-calculator.h  | 24 ++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/lte/helper/mac-stats-calculator.cc b/src/lte/helper/mac-stats-calculator.cc
index b21e4dd20..e8c303139 100644
--- a/src/lte/helper/mac-stats-calculator.cc
+++ b/src/lte/helper/mac-stats-calculator.cc
@@ -51,17 +51,41 @@ MacStatsCalculator::GetTypeId (void)
     .AddAttribute ("DlOutputFilename",
                    "Name of the file where the downlink results will be saved.",
                    StringValue ("DlMacStats.txt"),
-                   MakeStringAccessor (&LteStatsCalculator::SetDlOutputFilename),
+                   MakeStringAccessor (&MacStatsCalculator::SetDlOutputFilename),
                    MakeStringChecker ())
     .AddAttribute ("UlOutputFilename",
                    "Name of the file where the uplink results will be saved.",
                    StringValue ("UlMacStats.txt"),
-                   MakeStringAccessor (&LteStatsCalculator::SetUlOutputFilename),
+                   MakeStringAccessor (&MacStatsCalculator::SetUlOutputFilename),
                    MakeStringChecker ())
   ;
   return tid;
 }
 
+void
+MacStatsCalculator::SetUlOutputFilename (std::string outputFilename)
+{
+  LteStatsCalculator::SetUlOutputFilename (outputFilename);
+}
+
+std::string
+MacStatsCalculator::GetUlOutputFilename (void)
+{
+  return LteStatsCalculator::GetUlOutputFilename ();
+}
+
+void
+MacStatsCalculator::SetDlOutputFilename (std::string outputFilename)
+{
+  LteStatsCalculator::SetDlOutputFilename (outputFilename);
+}
+
+std::string
+MacStatsCalculator::GetDlOutputFilename (void)
+{
+  return LteStatsCalculator::GetDlOutputFilename ();
+}
+
 void
 MacStatsCalculator::DlScheduling (uint16_t cellId, uint64_t imsi, uint32_t frameNo, uint32_t subframeNo,
                                   uint16_t rnti, uint8_t mcsTb1, uint16_t sizeTb1, uint8_t mcsTb2, uint16_t sizeTb2)
diff --git a/src/lte/helper/mac-stats-calculator.h b/src/lte/helper/mac-stats-calculator.h
index 59c0ef1de..c4c69d8e8 100644
--- a/src/lte/helper/mac-stats-calculator.h
+++ b/src/lte/helper/mac-stats-calculator.h
@@ -59,6 +59,30 @@ public:
    */
   static TypeId GetTypeId (void);
 
+  /**
+   * Set the name of the file where the uplink statistics will be stored.
+   *
+   * \param outputFilename string with the name of the file
+   */
+  void SetUlOutputFilename (std::string outputFilename);
+
+  /**
+   * Get the name of the file where the uplink statistics will be stored.
+   */
+  std::string GetUlOutputFilename (void);
+
+  /**
+   * Set the name of the file where the downlink statistics will be stored.
+   *
+   * @param outputFilename string with the name of the file
+   */
+  void SetDlOutputFilename (std::string outputFilename);
+
+  /**
+   * Get the name of the file where the downlink statistics will be stored.
+   */
+  std::string GetDlOutputFilename (void);
+
   /**
    * Notifies the stats calculator that an downlink scheduling has occurred.
    * @param cellId Cell ID of the attached Enb