Adapat to enum changes in NS-3

Signed-off-by: Anders Martinsson <anders.martinsson@intinor.se>

Author: Sikabo

model/task-manager.cc

@@ -92,7 +92,7 @@ TaskManager::GetTypeId (void)
                    "deallocate and switch among fibers.",
                    TypeId::ATTR_CONSTRUCT,
                    EnumValue (PTHREAD_FIBER_MANAGER),
-                   MakeEnumAccessor (&TaskManager::SetFiberManagerType),
+                   MakeEnumAccessor<FiberManagerType>  (&TaskManager::SetFiberManagerType),
                    MakeEnumChecker (PTHREAD_FIBER_MANAGER, "PthreadFiberManager",
                                     UCONTEXT_FIBER_MANAGER, "UcontextFiberManager"))
   ;

test/addons/dce-linux-ip6-test.cc

@@ -363,7 +363,7 @@ static class DceLinuxIp6TestSuite : public TestSuite
 
 
 DceLinuxIp6TestSuite::DceLinuxIp6TestSuite ()
-  : TestSuite ("dce-linux-ip6", UNIT)
+  : TestSuite ("dce-linux-ip6", Type::UNIT)
 {
   typedef struct
   {
@@ -393,7 +393,7 @@ DceLinuxIp6TestSuite::DceLinuxIp6TestSuite ()
       AddTestCase (new DceLinuxIp6TestCase (std::string (tests[i].name),
                                             Seconds (tests[i].duration),
                                             tests[i].skip),
-                   TestCase::QUICK);
+                   Duration::QUICK);
     }
 }
 

test/dce-cradle-test.cc

@@ -137,7 +137,7 @@ static class DceCradleTestSuite : public TestSuite
 
 
 DceCradleTestSuite::DceCradleTestSuite ()
-  : TestSuite ("dce-cradle", UNIT)
+  : TestSuite ("dce-cradle", Type::UNIT)
 {
   typedef struct {
     const char *name;
@@ -172,8 +172,8 @@ DceCradleTestSuite::DceCradleTestSuite ()
                                           Seconds (tests[i].duration),
                                           tests[i].sockf,
                                           tests[i].isSkip
-                                          ), 
-                   TestCase::QUICK);
+                                          ),
+                   Duration::QUICK);
     }
 }
 

test/dce-manager-test.cc

@@ -166,7 +166,7 @@ static class DceManagerTestSuite : public TestSuite
 #define FREEBSD_STACK  (1 << 2)
 
 DceManagerTestSuite::DceManagerTestSuite ()
-  : TestSuite ("dce-process-manager", UNIT)
+  : TestSuite ("dce-process-manager", Type::UNIT)
 {
   typedef struct
   {
@@ -257,7 +257,7 @@ DceManagerTestSuite::DceManagerTestSuite ()
                                            (tests[i].stackMask & NS3_STACK) ?
                                            (isUctxFiber ? tests[i].skipUctx : false) : true
                                            ),
-                   TestCase::QUICK);
+                   Duration::QUICK);
     }
 
   // linux stack
@@ -275,7 +275,7 @@ DceManagerTestSuite::DceManagerTestSuite ()
                                                (tests[i].stackMask & LINUX_STACK) ?
                                                (isUctxFiber ? tests[i].skipUctx : false) : true
                                                ),
-                       TestCase::QUICK);
+                       Duration::QUICK);
         }
     }
 
@@ -293,7 +293,7 @@ DceManagerTestSuite::DceManagerTestSuite ()
                                                (tests[i].stackMask & FREEBSD_STACK) ?
                                                (isUctxFiber ? tests[i].skipUctx : false) : true
                                                ),
-                       TestCase::QUICK);
+                       Duration::QUICK);
         }
     }
 }

test/dce-mptcp-test.cc

@@ -353,7 +353,7 @@ static class DceMptcpTestSuite : public TestSuite
 
 
 DceMptcpTestSuite::DceMptcpTestSuite ()
-  : TestSuite ("dce-mptcp", UNIT)
+  : TestSuite ("dce-mptcp", Type::UNIT)
 {
   typedef struct {
     const char *name;
@@ -382,7 +382,7 @@ DceMptcpTestSuite::DceMptcpTestSuite ()
                                          tests[i].sockf,
                                          tests[i].isSkip
                                          ),
-                   TestCase::QUICK);
+                   Duration::QUICK);
     }
 }
 

test/netlink-socket-test.cc

@@ -598,9 +598,9 @@ static class NetlinkSocketTestSuite : public TestSuite
 } g_netlinkTestSuite;
 
 NetlinkSocketTestSuite::NetlinkSocketTestSuite ()
-  : TestSuite ("dce-netlink-socket", UNIT)
+  : TestSuite ("dce-netlink-socket", Type::UNIT)
 {
-  AddTestCase (new NetlinkSocketTestCase (), TestCase::QUICK);
+  AddTestCase (new NetlinkSocketTestCase (), Duration::QUICK);
 }
 
 } // namespace ns3