diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-06-10 16:42:43 +0200 | 
|---|---|---|
| committer | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-06-10 16:42:43 +0200 | 
| commit | c0fad3028fd55c2067ce6a0ae4382cffe1014284 (patch) | |
| tree | 1515516ba685b43c2b8dc97d3de62b782f61e7e2 /indra/llcorehttp | |
| parent | 37e4c6911902b9dcec0192e8bb93bbaeacb1d60a (diff) | |
Re-enable compiler warnings C4018, C4100, C4231 and C4506
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/_httplibcurl.cpp | 10 | ||||
| -rw-r--r-- | indra/llcorehttp/_httplibcurl.h | 6 | 
2 files changed, 8 insertions, 8 deletions
| diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp index 8ed517ffca..6a15f08011 100644 --- a/indra/llcorehttp/_httplibcurl.cpp +++ b/indra/llcorehttp/_httplibcurl.cpp @@ -88,7 +88,7 @@ void HttpLibcurl::shutdown()      if (mMultiHandles)      { -        for (int policy_class(0); policy_class < mPolicyCount; ++policy_class) +        for (unsigned int policy_class(0); policy_class < mPolicyCount; ++policy_class)          {              if (mMultiHandles[policy_class])              { @@ -122,7 +122,7 @@ void HttpLibcurl::start(int policy_count)      mActiveHandles = new int [mPolicyCount];      mDirtyPolicy = new bool [mPolicyCount]; -    for (int policy_class(0); policy_class < mPolicyCount; ++policy_class) +    for (unsigned int policy_class(0); policy_class < mPolicyCount; ++policy_class)      {          if (NULL == (mMultiHandles[policy_class] = curl_multi_init()))          { @@ -148,7 +148,7 @@ HttpService::ELoopSpeed HttpLibcurl::processTransport()      HttpService::ELoopSpeed ret(HttpService::REQUEST_SLEEP);      // Give libcurl some cycles to do I/O & callbacks -    for (int policy_class(0); policy_class < mPolicyCount; ++policy_class) +    for (unsigned int policy_class(0); policy_class < mPolicyCount; ++policy_class)      {          if (! mMultiHandles[policy_class])          { @@ -446,14 +446,14 @@ int HttpLibcurl::getActiveCount() const  } -int HttpLibcurl::getActiveCountInClass(int policy_class) const +int HttpLibcurl::getActiveCountInClass(unsigned int policy_class) const  {      llassert_always(policy_class < mPolicyCount);      return mActiveHandles ? mActiveHandles[policy_class] : 0;  } -void HttpLibcurl::policyUpdated(int policy_class) +void HttpLibcurl::policyUpdated(unsigned int policy_class)  {      LL_PROFILE_ZONE_SCOPED_CATEGORY_NETWORK;      if (policy_class < 0 || policy_class >= mPolicyCount || ! mMultiHandles) diff --git a/indra/llcorehttp/_httplibcurl.h b/indra/llcorehttp/_httplibcurl.h index a1b537d354..3631965837 100644 --- a/indra/llcorehttp/_httplibcurl.h +++ b/indra/llcorehttp/_httplibcurl.h @@ -107,7 +107,7 @@ public:      ///      /// Threading:  called by worker thread.      int getActiveCount() const; -    int getActiveCountInClass(int policy_class) const; +    int getActiveCountInClass(unsigned int policy_class) const;      /// Attempt to cancel a request identified by handle.      /// @@ -124,7 +124,7 @@ public:      /// initialization and dynamic option setting.      ///      /// Threading:  called by worker thread. -    void policyUpdated(int policy_class); +    void policyUpdated(unsigned int policy_class);      /// Allocate a curl handle for caller.  May be freed using      /// either the freeHandle() method or calling curl_easy_cleanup() @@ -211,7 +211,7 @@ protected:      HttpService *       mService;           // Simple reference, not owner      HandleCache         mHandleCache;       // Handle allocator, owner      active_set_t        mActiveOps; -    int                 mPolicyCount; +    unsigned int        mPolicyCount;      CURLM **            mMultiHandles;      // One handle per policy class      int *               mActiveHandles;     // Active count per policy class      bool *              mDirtyPolicy;       // Dirty policy update waiting for stall (per pc) | 
