src/agent/Watchdog/WatchdogMain.cpp in passenger-5.1.2 vs src/agent/Watchdog/WatchdogMain.cpp in passenger-5.1.3

- old
+ new

@@ -1,8 +1,8 @@ /* * Phusion Passenger - https://www.phusionpassenger.com/ - * Copyright (c) 2010-2015 Phusion Holding B.V. + * Copyright (c) 2010-2017 Phusion Holding B.V. * * "Passenger", "Phusion Passenger" and "Union Station" are registered * trademarks of Phusion Holding B.V. * * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -385,12 +385,12 @@ } } static void cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers, char *argv[]) { - this_thread::disable_interruption di; - this_thread::disable_syscall_interruption dsi; + boost::this_thread::disable_interruption di; + boost::this_thread::disable_syscall_interruption dsi; pid_t pid; int e; pid = fork(); if (pid == 0) { @@ -1328,11 +1328,11 @@ P_INFO("All " PROGRAM_NAME " agents started!"); UPDATE_TRACE_POINT(); runHookScriptAndThrowOnError("after_watchdog_initialization"); UPDATE_TRACE_POINT(); - this_thread::disable_interruption di; - this_thread::disable_syscall_interruption dsi; + boost::this_thread::disable_interruption di; + boost::this_thread::disable_syscall_interruption dsi; bool shouldExitGracefully = waitForStarterProcessOrWatchers(wo, watchers); if (shouldExitGracefully) { /* Fork a child process which cleans up all the agent processes in * the background and exit this watchdog process so that we don't block * the web server.