From 17147bcacf7dcf551e03bf07f7c86a9916b2378c Mon Sep 17 00:00:00 2001 From: "Hongli Lai (Phusion)" Date: Thu, 3 Oct 2024 16:37:45 +0200 Subject: [PATCH] Improve VSCode IntelliSense support --- .vscode/c_cpp_properties.json | 5 +- .vscode/settings.json | 57 ++++++++++++++++++- .../Group/InitializationAndShutdown.cpp | 8 +++ .../ApplicationPool/Group/InternalUtils.cpp | 9 +++ .../Group/LifetimeAndBasics.cpp | 8 +++ .../ApplicationPool/Group/Miscellaneous.cpp | 9 +++ .../ApplicationPool/Group/OutOfBandWork.cpp | 9 +++ .../Group/ProcessListManagement.cpp | 14 ++++- .../Group/SessionManagement.cpp | 8 +++ .../Group/SpawningAndRestarting.cpp | 8 +++ .../ApplicationPool/Group/StateInspection.cpp | 8 +++ .../ApplicationPool/Group/Verification.cpp | 8 +++ .../Pool/AnalyticsCollection.cpp | 5 ++ .../Pool/GarbageCollection.cpp | 5 ++ .../ApplicationPool/Pool/GeneralUtils.cpp | 5 ++ .../Core/ApplicationPool/Pool/GroupUtils.cpp | 5 ++ .../Pool/InitializationAndShutdown.cpp | 5 ++ .../ApplicationPool/Pool/Miscellaneous.cpp | 5 ++ .../ApplicationPool/Pool/ProcessUtils.cpp | 5 ++ .../ApplicationPool/Pool/StateInspection.cpp | 5 ++ 20 files changed, 182 insertions(+), 9 deletions(-) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 2e099e109b..5f47167638 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -7,7 +7,6 @@ "${workspaceFolder}/src/agent", "${workspaceFolder}/src/cxx_supportlib", "${workspaceFolder}/src/cxx_supportlib/vendor-copy", - "${workspaceFolder}/src/cxx_supportlib/vendor-copy/websocketpp", "${workspaceFolder}/src/cxx_supportlib/vendor-copy/libuv/include", "${workspaceFolder}/src/cxx_supportlib/vendor-modified", "${workspaceFolder}/src/cxx_supportlib/vendor-modified/libev", @@ -31,10 +30,8 @@ "/System/Library/Frameworks", "/Library/Frameworks" ], - "compilerPath": "/usr/bin/clang", "cStandard": "c11", - "cppStandard": "c++17", - "intelliSenseMode": "clang-x64" + "cppStandard": "c++17" } ], "version": 4 diff --git a/.vscode/settings.json b/.vscode/settings.json index 9fe901b080..33a0b721cb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -44,8 +44,59 @@ "string_view": "cpp", "unordered_map": "cpp", "valarray": "cpp", - "vector": "cpp" + "vector": "cpp", + "__node_handle": "cpp", + "__threading_support": "cpp", + "__verbose_abort": "cpp", + "any": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "charconv": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "codecvt": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "execution": "cpp", + "forward_list": "cpp", + "fstream": "cpp", + "future": "cpp", + "iomanip": "cpp", + "ios": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "optional": "cpp", + "ostream": "cpp", + "print": "cpp", + "queue": "cpp", + "ratio": "cpp", + "shared_mutex": "cpp", + "source_location": "cpp", + "span": "cpp", + "sstream": "cpp", + "stack": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "strstream": "cpp", + "unordered_set": "cpp", + "variant": "cpp", + "algorithm": "cpp" }, - "C_Cpp.intelliSenseEngine": "Default", - "C_Cpp.intelliSenseEngineFallback": "Enabled" + "C_Cpp.intelliSenseEngineFallback": "enabled", + "C_Cpp.default.cStandard": "c11", + "C_Cpp.default.cppStandard": "c++14" } diff --git a/src/agent/Core/ApplicationPool/Group/InitializationAndShutdown.cpp b/src/agent/Core/ApplicationPool/Group/InitializationAndShutdown.cpp index 768331746b..17d7ea73a4 100644 --- a/src/agent/Core/ApplicationPool/Group/InitializationAndShutdown.cpp +++ b/src/agent/Core/ApplicationPool/Group/InitializationAndShutdown.cpp @@ -23,6 +23,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_INITIALIZATION_AND_SHUTDOWN_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_INITIALIZATION_AND_SHUTDOWN_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include /************************************************************************* @@ -179,3 +185,5 @@ Group::shutdown(const Callback &callback, } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_INITIALIZATION_AND_SHUTDOWN_CPP_ diff --git a/src/agent/Core/ApplicationPool/Group/InternalUtils.cpp b/src/agent/Core/ApplicationPool/Group/InternalUtils.cpp index 034e43ce31..c92c416f77 100644 --- a/src/agent/Core/ApplicationPool/Group/InternalUtils.cpp +++ b/src/agent/Core/ApplicationPool/Group/InternalUtils.cpp @@ -23,7 +23,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_INTERNAL_UTILS_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_INTERNAL_UTILS_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include +#include /************************************************************************* * @@ -374,3 +381,5 @@ Group::callAbortLongRunningConnectionsCallback(const ProcessPtr &process) { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_INTERNAL_UTILS_CPP_ diff --git a/src/agent/Core/ApplicationPool/Group/LifetimeAndBasics.cpp b/src/agent/Core/ApplicationPool/Group/LifetimeAndBasics.cpp index 079162ba6a..cc41fa9cc5 100644 --- a/src/agent/Core/ApplicationPool/Group/LifetimeAndBasics.cpp +++ b/src/agent/Core/ApplicationPool/Group/LifetimeAndBasics.cpp @@ -23,6 +23,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_LIFETIME_AND_BASICS_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_LIFETIME_AND_BASICS_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include /************************************************************************* @@ -107,3 +113,5 @@ Group::getWrapperRegistry() const { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_LIFETIME_AND_BASICS_CPP_ diff --git a/src/agent/Core/ApplicationPool/Group/Miscellaneous.cpp b/src/agent/Core/ApplicationPool/Group/Miscellaneous.cpp index 8af3446b51..04e7a7d1f5 100644 --- a/src/agent/Core/ApplicationPool/Group/Miscellaneous.cpp +++ b/src/agent/Core/ApplicationPool/Group/Miscellaneous.cpp @@ -23,6 +23,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_MISCELLANEOUS_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_MISCELLANEOUS_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include /************************************************************************* @@ -65,3 +72,5 @@ Group::authorizeByApiKey(const ApiKey &key) const { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_MISCELLANEOUS_CPP_ diff --git a/src/agent/Core/ApplicationPool/Group/OutOfBandWork.cpp b/src/agent/Core/ApplicationPool/Group/OutOfBandWork.cpp index eb540b8f21..860c078897 100644 --- a/src/agent/Core/ApplicationPool/Group/OutOfBandWork.cpp +++ b/src/agent/Core/ApplicationPool/Group/OutOfBandWork.cpp @@ -23,6 +23,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_OUT_OF_BAND_WORK_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_OUT_OF_BAND_WORK_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include #include @@ -322,3 +329,5 @@ Group::requestOOBW(const ProcessPtr &process) { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_OUT_OF_BAND_WORK_CPP_ diff --git a/src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp b/src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp index 94438ff766..f387d13c70 100644 --- a/src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp +++ b/src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp @@ -23,6 +23,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_PROCESS_LIST_MANAGEMENT_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_PROCESS_LIST_MANAGEMENT_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include /************************************************************************* @@ -222,6 +228,7 @@ void Group::removeFromDisableWaitlist(const ProcessPtr &p, DisableResult result, boost::container::vector &postLockActions) { + const deque &disableWaitlist = this->disableWaitlist; deque::const_iterator it, end = disableWaitlist.end(); deque newList; for (it = disableWaitlist.begin(); it != end; it++) { @@ -233,7 +240,7 @@ Group::removeFromDisableWaitlist(const ProcessPtr &p, DisableResult result, newList.push_back(waiter); } } - disableWaitlist = newList; + this->disableWaitlist = newList; } void @@ -428,6 +435,7 @@ Group::attach(const ProcessPtr &process, /* Now that there are enough resources, relevant processes in * 'disableWaitlist' can be disabled. */ + const deque &disableWaitlist = this->disableWaitlist; deque::const_iterator it, end = disableWaitlist.end(); deque newDisableWaitlist; for (it = disableWaitlist.begin(); it != end; it++) { @@ -451,7 +459,7 @@ Group::attach(const ProcessPtr &process, newDisableWaitlist.push_back(waiter); } } - disableWaitlist = newDisableWaitlist; + this->disableWaitlist = newDisableWaitlist; // Update GC sleep timer. wakeUpGarbageCollector(); @@ -616,3 +624,5 @@ Group::disable(const ProcessPtr &process, const DisableCallback &callback) { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_PROCESS_LIST_MANAGEMENT_CPP_ diff --git a/src/agent/Core/ApplicationPool/Group/SessionManagement.cpp b/src/agent/Core/ApplicationPool/Group/SessionManagement.cpp index a9e9510077..2ce3fc8689 100644 --- a/src/agent/Core/ApplicationPool/Group/SessionManagement.cpp +++ b/src/agent/Core/ApplicationPool/Group/SessionManagement.cpp @@ -23,6 +23,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_SESSION_MANAGEMENT_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_SESSION_MANAGEMENT_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include /************************************************************************* @@ -336,3 +342,5 @@ Group::get(const Options &newOptions, const GetCallback &callback, } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_SESSION_MANAGEMENT_CPP_ diff --git a/src/agent/Core/ApplicationPool/Group/SpawningAndRestarting.cpp b/src/agent/Core/ApplicationPool/Group/SpawningAndRestarting.cpp index b2048231b7..3f9b9963df 100644 --- a/src/agent/Core/ApplicationPool/Group/SpawningAndRestarting.cpp +++ b/src/agent/Core/ApplicationPool/Group/SpawningAndRestarting.cpp @@ -23,6 +23,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_SPAWNING_AND_RESTARTING_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_SPAWNING_AND_RESTARTING_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include /************************************************************************* @@ -485,3 +491,5 @@ Group::allowSpawn() const { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_SPAWNING_AND_RESTARTING_CPP_ diff --git a/src/agent/Core/ApplicationPool/Group/StateInspection.cpp b/src/agent/Core/ApplicationPool/Group/StateInspection.cpp index 54834e3c5b..55b0ae2c5d 100644 --- a/src/agent/Core/ApplicationPool/Group/StateInspection.cpp +++ b/src/agent/Core/ApplicationPool/Group/StateInspection.cpp @@ -23,6 +23,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_STATE_INSPECTION_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_STATE_INSPECTION_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include #include #include @@ -303,3 +309,5 @@ Group::inspectConfigInAdminPanelFormat(Json::Value &result) const { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_STATE_INSPECTION_CPP_ diff --git a/src/agent/Core/ApplicationPool/Group/Verification.cpp b/src/agent/Core/ApplicationPool/Group/Verification.cpp index ad6b59accc..93cb46bf20 100644 --- a/src/agent/Core/ApplicationPool/Group/Verification.cpp +++ b/src/agent/Core/ApplicationPool/Group/Verification.cpp @@ -23,6 +23,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_GROUP_VERIFICATION_CPP_ +#define _PASSENGER_APPLICATION_POOL_GROUP_VERIFICATION_CPP_ + +#ifdef INTELLISENSE + #include +#endif #include /************************************************************************* @@ -158,3 +164,5 @@ Group::verifyNoRequestsOnGetWaitlistAreRoutable() const { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_GROUP_VERIFICATION_CPP_ diff --git a/src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp b/src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp index 647bb96b5c..6ce93d3f5c 100644 --- a/src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp +++ b/src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp @@ -23,6 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_POOL_ANALYTICS_COLLECTION_CPP_ +#define _PASSENGER_APPLICATION_POOL_POOL_ANALYTICS_COLLECTION_CPP_ + #include /************************************************************************* @@ -191,3 +194,5 @@ Pool::realCollectAnalytics() { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_POOL_ANALYTICS_COLLECTION_CPP_ diff --git a/src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp b/src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp index 708b02bc47..b255e4e001 100644 --- a/src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp +++ b/src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp @@ -23,6 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_POOL_GARBAGE_COLLECTION_CPP_ +#define _PASSENGER_APPLICATION_POOL_POOL_GARBAGE_COLLECTION_CPP_ + #include /************************************************************************* @@ -199,3 +202,5 @@ Pool::wakeupGarbageCollector() { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_POOL_GARBAGE_COLLECTION_CPP_ diff --git a/src/agent/Core/ApplicationPool/Pool/GeneralUtils.cpp b/src/agent/Core/ApplicationPool/Pool/GeneralUtils.cpp index 34167d0e1c..088446908e 100644 --- a/src/agent/Core/ApplicationPool/Pool/GeneralUtils.cpp +++ b/src/agent/Core/ApplicationPool/Pool/GeneralUtils.cpp @@ -23,6 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_POOL_GENERAL_UTILS_CPP_ +#define _PASSENGER_APPLICATION_POOL_POOL_GENERAL_UTILS_CPP_ + #include /************************************************************************* @@ -237,3 +240,5 @@ Pool::getRandomGenerator() const { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_POOL_GENERAL_UTILS_CPP_ diff --git a/src/agent/Core/ApplicationPool/Pool/GroupUtils.cpp b/src/agent/Core/ApplicationPool/Pool/GroupUtils.cpp index d780d0eb68..46bdf9ef14 100644 --- a/src/agent/Core/ApplicationPool/Pool/GroupUtils.cpp +++ b/src/agent/Core/ApplicationPool/Pool/GroupUtils.cpp @@ -23,6 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_POOL_GROUP_UTILS_CPP_ +#define _PASSENGER_APPLICATION_POOL_POOL_GROUP_UTILS_CPP_ + #include /************************************************************************* @@ -288,3 +291,5 @@ Pool::restartGroupsByAppRoot(const StaticString &appRoot, const RestartOptions & } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_POOL_GROUP_UTILS_CPP_ diff --git a/src/agent/Core/ApplicationPool/Pool/InitializationAndShutdown.cpp b/src/agent/Core/ApplicationPool/Pool/InitializationAndShutdown.cpp index 0f8f1f414a..613b2c1b13 100644 --- a/src/agent/Core/ApplicationPool/Pool/InitializationAndShutdown.cpp +++ b/src/agent/Core/ApplicationPool/Pool/InitializationAndShutdown.cpp @@ -23,6 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_POOL_INITIALIZATION_AND_SHUTDOWN_CPP_ +#define _PASSENGER_APPLICATION_POOL_POOL_INITIALIZATION_AND_SHUTDOWN_CPP_ + #include /************************************************************************* @@ -140,3 +143,5 @@ Pool::destroy() { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_POOL_INITIALIZATION_AND_SHUTDOWN_CPP_ diff --git a/src/agent/Core/ApplicationPool/Pool/Miscellaneous.cpp b/src/agent/Core/ApplicationPool/Pool/Miscellaneous.cpp index d53ddd278a..7276bd3e49 100644 --- a/src/agent/Core/ApplicationPool/Pool/Miscellaneous.cpp +++ b/src/agent/Core/ApplicationPool/Pool/Miscellaneous.cpp @@ -23,6 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_POOL_MISCELLANEOUS_CPP_ +#define _PASSENGER_APPLICATION_POOL_POOL_MISCELLANEOUS_CPP_ + #include /************************************************************************* @@ -250,3 +253,5 @@ Pool::authorizeByUid(uid_t uid, bool lock) const { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_POOL_MISCELLANEOUS_CPP_ diff --git a/src/agent/Core/ApplicationPool/Pool/ProcessUtils.cpp b/src/agent/Core/ApplicationPool/Pool/ProcessUtils.cpp index 79c7d4e8ff..0facf16391 100644 --- a/src/agent/Core/ApplicationPool/Pool/ProcessUtils.cpp +++ b/src/agent/Core/ApplicationPool/Pool/ProcessUtils.cpp @@ -23,6 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_POOL_PROCESS_UTILS_CPP_ +#define _PASSENGER_APPLICATION_POOL_POOL_PROCESS_UTILS_CPP_ + #include /************************************************************************* @@ -329,3 +332,5 @@ Pool::disableProcess(const StaticString &gupid) { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_POOL_PROCESS_UTILS_CPP_ diff --git a/src/agent/Core/ApplicationPool/Pool/StateInspection.cpp b/src/agent/Core/ApplicationPool/Pool/StateInspection.cpp index 27b3fac326..9999ce3adc 100644 --- a/src/agent/Core/ApplicationPool/Pool/StateInspection.cpp +++ b/src/agent/Core/ApplicationPool/Pool/StateInspection.cpp @@ -23,6 +23,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef _PASSENGER_APPLICATION_POOL_POOL_STATE_INSPECTION_CPP_ +#define _PASSENGER_APPLICATION_POOL_POOL_STATE_INSPECTION_CPP_ + #include /************************************************************************* @@ -436,3 +439,5 @@ Pool::getGroupCount() const { } // namespace ApplicationPool2 } // namespace Passenger + +#endif // _PASSENGER_APPLICATION_POOL_POOL_STATE_INSPECTION_CPP_