diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:28:15 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:28:15 +0300 |
| commit | 85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9 (patch) | |
| tree | 494487bbc57c79d17921b7443003d2a118e24ddb /indra/llcorehttp/_httpreplyqueue.h | |
| parent | 398369233fc2621eb447701e26082057fb0c97d7 (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge branch 'main' into marchcat/a-merge
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
Diffstat (limited to 'indra/llcorehttp/_httpreplyqueue.h')
| -rw-r--r-- | indra/llcorehttp/_httpreplyqueue.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcorehttp/_httpreplyqueue.h b/indra/llcorehttp/_httpreplyqueue.h index 33e205c1c9..2de26249ef 100644 --- a/indra/llcorehttp/_httpreplyqueue.h +++ b/indra/llcorehttp/_httpreplyqueue.h @@ -63,8 +63,8 @@ class HttpReplyQueue : private boost::noncopyable { public: - typedef boost::shared_ptr<HttpOperation> opPtr_t; - typedef boost::shared_ptr<HttpReplyQueue> ptr_t; + typedef std::shared_ptr<HttpOperation> opPtr_t; + typedef std::shared_ptr<HttpReplyQueue> ptr_t; HttpReplyQueue(); virtual ~HttpReplyQueue(); |