Minor changes to get 'make test' to pass.
- some namespace conflicts due to unpep8 - fixed infinite recursion caused by removing redundant makeIntfPair
This commit is contained in:
- some namespace conflicts due to unpep8 - fixed infinite recursion caused by removing redundant makeIntfPair