Switch to unified view

a/src/netcon.cpp b/src/netcon.cpp
...
...
1206
        } else {
1206
        } else {
1207
            sleep(1);
1207
            sleep(1);
1208
        }
1208
        }
1209
    }
1209
    }
1210
#else
1210
#else
1211
    STD_SHARED_PTR<NetconWorker> worker =
1211
    std::shared_ptr<NetconWorker> worker =
1212
        STD_SHARED_PTR<NetconWorker>(new CliNetconWorker());
1212
        std::shared_ptr<NetconWorker>(new CliNetconWorker());
1213
    clicon->setcallback(worker);
1213
    clicon->setcallback(worker);
1214
    SelectLoop myloop;
1214
    SelectLoop myloop;
1215
    myloop.addselcon(con, Netcon::NETCONPOLL_WRITE);
1215
    myloop.addselcon(con, Netcon::NETCONPOLL_WRITE);
1216
    fprintf(stderr, "client ready\n");
1216
    fprintf(stderr, "client ready\n");
1217
    ret = myloop.doLoop();
1217
    ret = myloop.doLoop();
...
...
1272
    int cando(Netcon::Event reason) {
1272
    int cando(Netcon::Event reason) {
1273
        NetconServCon *con = accept();
1273
        NetconServCon *con = accept();
1274
        if (con == 0) {
1274
        if (con == 0) {
1275
            return -1;
1275
            return -1;
1276
        }
1276
        }
1277
        STD_SHARED_PTR<NetconWorker> worker =
1277
        std::shared_ptr<NetconWorker> worker =
1278
            STD_SHARED_PTR<NetconWorker>(new ServNetconWorker());
1278
            std::shared_ptr<NetconWorker>(new ServNetconWorker());
1279
        con->setcallback(worker);
1279
        con->setcallback(worker);
1280
        m_loop.addselcon(NetconP(con), NETCONPOLL_READ);
1280
        m_loop.addselcon(NetconP(con), NETCONPOLL_READ);
1281
        return 1;
1281
        return 1;
1282
    }
1282
    }
1283
    SelectLoop& m_loop;
1283
    SelectLoop& m_loop;