Use default arguments instead of overloaded virtual constructors for cleaner interface

diff --git a/usrp/host/lib/fusb.h b/usrp/host/lib/fusb.h
index dbfda5a610a9889d8d19092dc95ba8f10530aada..00bdffcc017a98631b4f553fa198e2a853b85733 100644 (file)
--- a/usrp/host/lib/fusb.h
+++ b/usrp/host/lib/fusb.h
@@ -127,9 +127,7 @@ public:
    * \brief returns fusb_devhandle or throws if trouble
    */
   static fusb_devhandle *make_devhandle (libusb_device_handle *udh,
-                                         libusb_context *ctx);
-
-  static fusb_devhandle *make_devhandle (libusb_device_handle *udh);
+                                         libusb_context *ctx = 0);
 
   /*!
    * \brief Returns max block size in bytes (hard limit).

diff --git a/usrp/host/lib/fusb_sysconfig_libusb1.cc b/usrp/host/lib/fusb_sysconfig_libusb1.cc
index 4cbb741324da4a4972d74bf3cb4c74ff34cd33c8..f71e34fa947dcc14c326954e5eaeee918f70c944 100644 (file)
--- a/usrp/host/lib/fusb_sysconfig_libusb1.cc
+++ b/usrp/host/lib/fusb_sysconfig_libusb1.cc
@@ -29,12 +29,6 @@ static const int FUSB_BUFFER_SIZE = 1 * (1L << 20);  // 1 MB
 
 struct libusb_context;
 
-fusb_devhandle *
-fusb_sysconfig::make_devhandle (libusb_device_handle *udh)
-{
-  make_devhandle (udh, NULL); 
-}
-
 fusb_devhandle *
 fusb_sysconfig::make_devhandle (libusb_device_handle *udh,
                                 libusb_context *ctx)

diff --git a/usrp/host/lib/fusb_sysconfig_linux.cc b/usrp/host/lib/fusb_sysconfig_linux.cc
index d4bbfea76200d66ea8eb0c628d7ea5b4fd29bebe..5b9bfb24a83ff3863259d356ea55ee29cdc874dc 100644 (file)
--- a/usrp/host/lib/fusb_sysconfig_linux.cc
+++ b/usrp/host/lib/fusb_sysconfig_linux.cc
@@ -27,12 +27,6 @@ static const int MAX_BLOCK_SIZE     =  16 * 1024;    // hard limit
 static const int DEFAULT_BLOCK_SIZE =   4 * 1024;      // fewer kernel memory problems
 static const int FUSB_BUFFER_SIZE   =   1 * (1L << 20); // 1MB
 
-fusb_devhandle *
-fusb_sysconfig::make_devhandle (usb_dev_handle *udh)
-{
-  return new fusb_devhandle_linux (udh);
-}
-
 fusb_devhandle *
 fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
 {