diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-15 18:31:17 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-01-15 18:31:17 +0200 |
| commit | fa15830e02ed249186625e845e2ac19749d10193 (patch) | |
| tree | 645e4916d97b28f678ca57810e9ecc19b5dd551b /indra/llcorehttp | |
| parent | 346fc435f1b12e47b8bf51d15c70ceca4615de41 (diff) | |
SL-10291 Replace apr_atomic with standard C++11 functionality
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/_httpservice.h | 2 | ||||
| -rw-r--r-- | indra/llcorehttp/_refcounted.h | 2 | ||||
| -rw-r--r-- | indra/llcorehttp/_thread.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcorehttp/_httpservice.h b/indra/llcorehttp/_httpservice.h index ac518a5de7..d0c37ac195 100644 --- a/indra/llcorehttp/_httpservice.h +++ b/indra/llcorehttp/_httpservice.h @@ -31,7 +31,7 @@ #include <vector> #include "linden_common.h" -#include "llapr.h" +#include "llatomic.h" #include "httpcommon.h" #include "httprequest.h" #include "_httppolicyglobal.h" diff --git a/indra/llcorehttp/_refcounted.h b/indra/llcorehttp/_refcounted.h index 7f713f2298..5cc8914395 100644 --- a/indra/llcorehttp/_refcounted.h +++ b/indra/llcorehttp/_refcounted.h @@ -34,7 +34,7 @@ #include <boost/thread.hpp> #include <boost/intrusive_ptr.hpp> -#include "llapr.h" +#include "llatomic.h" namespace LLCoreInt diff --git a/indra/llcorehttp/_thread.h b/indra/llcorehttp/_thread.h index e058d660e5..22b7750bad 100644 --- a/indra/llcorehttp/_thread.h +++ b/indra/llcorehttp/_thread.h @@ -33,6 +33,7 @@ #include <boost/function.hpp> #include <boost/date_time/posix_time/posix_time_types.hpp> +#include "apr.h" // thread-related functions #include "_refcounted.h" namespace LLCoreInt |