branch merge

This commit is contained in:
Craig Dowell committed 2010-01-25 14:25:18 -08:00
commit 6a6bd1a4ea
8 files changed
+73 -27

No files matched your search

+2 -1
View File
@@ -138,7 +138,8 @@ def main():
pass
if 'Threading' not in enabled_features:
for clsname in ['SystemThread', 'SystemMutex', 'SystemCondition', 'CriticalSection', 'SimpleRefCount< ns3::SystemThread, ns3::empty >']:
for clsname in ['SystemThread', 'SystemMutex', 'SystemCondition', 'CriticalSection',
'SimpleRefCount< ns3::SystemThread, ns3::empty, ns3::DefaultDeleter<ns3::SystemThread> >']:
root_module.classes.remove(root_module['ns3::%s' % clsname])
if 'EmuNetDevice' not in enabled_features: