diff --git a/dbcon/execplan/clientrotator.cpp b/dbcon/execplan/clientrotator.cpp index bb9f80bfa..d960f0e26 100644 --- a/dbcon/execplan/clientrotator.cpp +++ b/dbcon/execplan/clientrotator.cpp @@ -28,9 +28,9 @@ #include #include #include +#include using namespace std; -#include #include using namespace boost; @@ -343,9 +343,11 @@ void ClientRotator::connectList(double timeout) if (++idx >= fClients.size() ) idx = 0; - timer runTime; + typedef std::chrono::steady_clock clock; + auto start = clock::now(); - while ( runTime.elapsed() < timeout) + typedef std::chrono::duration double_secs; + while (std::chrono::duration_cast(clock::now() - start).count() < timeout) { try { @@ -355,8 +357,9 @@ void ClientRotator::connectList(double timeout) if (fClients.size() == idx) idx = 0; } - catch (... ) - { } + catch (...) + { + } } #ifdef LOG_TO_CERR diff --git a/ddlproc/ddlproc.cpp b/ddlproc/ddlproc.cpp index 0c9970bd9..32ba5dba9 100644 --- a/ddlproc/ddlproc.cpp +++ b/ddlproc/ddlproc.cpp @@ -41,7 +41,6 @@ using namespace joblist; //#include "boost/filesystem/operations.hpp" //#include "boost/filesystem/path.hpp" -#include "boost/progress.hpp" #include #include #include diff --git a/dmlproc/dmlproc.cpp b/dmlproc/dmlproc.cpp index a8b44ca25..f96e414e6 100644 --- a/dmlproc/dmlproc.cpp +++ b/dmlproc/dmlproc.cpp @@ -27,7 +27,6 @@ #include //#include "boost/filesystem/operations.hpp" //#include "boost/filesystem/path.hpp" -#include "boost/progress.hpp" using namespace std; #include "alarmglobal.h" diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index b772a6871..296f98be3 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #if defined(__linux__) diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp index 8e2ec1155..46af61900 100644 --- a/primitives/primproc/primitiveserver.cpp +++ b/primitives/primproc/primitiveserver.cpp @@ -45,7 +45,6 @@ typedef int pthread_t; using namespace std; -#include #include #include #include diff --git a/tools/ddlcleanup/ddlcleanup.cpp b/tools/ddlcleanup/ddlcleanup.cpp index 14e6334a2..d557519e0 100644 --- a/tools/ddlcleanup/ddlcleanup.cpp +++ b/tools/ddlcleanup/ddlcleanup.cpp @@ -29,7 +29,6 @@ #include #include "boost/filesystem/operations.hpp" #include "boost/filesystem/path.hpp" -#include "boost/progress.hpp" using namespace std; #include "rwlock.h" diff --git a/writeengine/server/we_ddlcommandproc.cpp b/writeengine/server/we_ddlcommandproc.cpp index 1526bdf8e..0b557a2c4 100644 --- a/writeengine/server/we_ddlcommandproc.cpp +++ b/writeengine/server/we_ddlcommandproc.cpp @@ -21,7 +21,6 @@ #include #include "boost/filesystem/operations.hpp" #include "boost/filesystem/path.hpp" -#include "boost/progress.hpp" #include "boost/scoped_ptr.hpp" using namespace std;