Bug 629: Make wimax compile with gcc-4.3.x and gcc-4.4.x
authorFaker Moatamri <faker.moatamri@sophia.inria.fr>
Tue Aug 04 09:16:24 2009 -0400 (6 months ago)
changeset 4537339edb6bdedd
parent 4530 3832cd7fee30
child 4538 9d68322b34b8
Bug 629: Make wimax compile with gcc-4.3.x and gcc-4.4.x
src/devices/wimax/IPCS_Bind_parameter_manager.h
src/devices/wimax/wimax-ss-net-device.cc
     1.1 --- a/src/devices/wimax/IPCS_Bind_parameter_manager.h	Tue Jul 07 13:45:28 2009 +0200
     1.2 +++ b/src/devices/wimax/IPCS_Bind_parameter_manager.h	Tue Aug 04 09:16:24 2009 -0400
     1.3 @@ -37,7 +37,7 @@
     1.4      IPCS_Classifier_Record* CreateIPCS_Classifier_Record (const char * src_ip_adr, const char * dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol,uint32_t SFID);
     1.5      IPCS_Classifier_Record* CreateIPCS_Classifier_Record (Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol,uint32_t SFID);
     1.6  	IPCS_Classifier_Record* GetIPCS_Classifier_Record (const Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol,uint32_t SFID)const;
     1.7 -    IPCS_Classifier_Record* GetIPCS_Classifier_Record (const Ipv4Address src_ip_adr, Ipv4Address src_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol)const;
     1.8 +    IPCS_Classifier_Record* GetIPCS_Classifier_Record (const Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol)const;
     1.9      uint32_t Get_SFID_Classifier_Record (const Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol)const;
    1.10      bool IsInRecord (const Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol)const;
    1.11      void DeleteIPCS_Classifier_Record(Ipv4Address src_ip_adr, Ipv4Address dst_ip_adr, uint16_t src_port, uint16_t dst_port, uint16_t protocol,uint32_t SFID);
     2.1 --- a/src/devices/wimax/wimax-ss-net-device.cc	Tue Jul 07 13:45:28 2009 +0200
     2.2 +++ b/src/devices/wimax/wimax-ss-net-device.cc	Tue Aug 04 09:16:24 2009 -0400
     2.3 @@ -933,7 +933,7 @@
     2.4                  Ptr<WimaxConnection> connection = NULL;
     2.5                  Simulator::Schedule(timeToAllocation,
     2.6                      &WimaxSubscriberStationNetDevice::SendBurst, this,
     2.7 -                    ulMapIe.GetUiuc(), ulMapIe.GetDuration(), connection);
     2.8 +                    ulMapIe.GetUiuc(), ulMapIe.GetDuration(), connection, MacHeaderType::HEADER_TYPE_GENERIC);
     2.9                }
    2.10            }
    2.11          else
    2.12 @@ -1056,4 +1056,4 @@
    2.13      event = eventId;
    2.14    }
    2.15  
    2.16 -}//namespace ns`
    2.17 +}//namespace ns3