Switch to unified view

a/libupnpp/control/discovery.cxx b/libupnpp/control/discovery.cxx
...
...
24
#include <map>
24
#include <map>
25
#include <functional>
25
#include <functional>
26
using namespace std;
26
using namespace std;
27
using namespace std::placeholders;
27
using namespace std::placeholders;
28
28
29
#include "upnpp_p.hxx"
30
31
#include <upnp/upnp.h>
29
#include <upnp/upnp.h>
32
#include <upnp/upnptools.h>
30
#include <upnp/upnptools.h>
33
31
32
#include "libupnpp/upnpp_p.hxx"
34
#include "workqueue.hxx"
33
#include "libupnpp/workqueue.hxx"
34
#include "libupnpp/upnpplib.hxx"
35
#include "upnpplib.hxx"
35
#include "libupnpp/log.hxx"
36
#include "description.hxx"
36
#include "description.hxx"
37
#include "discovery.hxx"
37
#include "discovery.hxx"
38
#include "log.hxx"
39
38
40
namespace UPnPClient {
39
namespace UPnPClient {
41
40
42
//#undef LOCAL_LOGINC
41
//#undef LOCAL_LOGINC
43
//#define LOCAL_LOGINC 3
42
//#define LOCAL_LOGINC 3
...
...
296
    m_lastSearch = time(0);
295
    m_lastSearch = time(0);
297
    return true;
296
    return true;
298
}
297
}
299
298
300
static UPnPDeviceDirectory *theDevDir;
299
static UPnPDeviceDirectory *theDevDir;
300
301
UPnPDeviceDirectory *UPnPDeviceDirectory::getTheDir(time_t search_window)
301
UPnPDeviceDirectory *UPnPDeviceDirectory::getTheDir(time_t search_window)
302
{
302
{
303
    if (theDevDir == 0)
303
    if (theDevDir == 0)
304
        theDevDir = new UPnPDeviceDirectory(search_window);
304
        theDevDir = new UPnPDeviceDirectory(search_window);
305
    if (theDevDir && !theDevDir->ok())
305
    if (theDevDir && !theDevDir->ok())