From 7c5643025804d94ce3efa92abf77e4965295072d Mon Sep 17 00:00:00 2001
From: rider <rider@lindenlab.com>
Date: Fri, 16 Oct 2015 12:15:33 -0700
Subject: [PATCH] MAINT-5271: Microsoft is just too permissive.
---
indra/llcorehttp/_httpoperation.h | 2 +-
indra/llcorehttp/httprequest.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llcorehttp/_httpoperation.h b/indra/llcorehttp/_httpoperation.h
index 417bdc7c508..1a75921c09c 100755
--- a/indra/llcorehttp/_httpoperation.h
+++ b/indra/llcorehttp/_httpoperation.h
@@ -162,7 +162,7 @@ class HttpOperation : private boost::noncopyable,
ptr_t ptr = findByHandle(handle);
if (!ptr)
return boost::shared_ptr< OPT >();
- return boost::dynamic_pointer_cast<HttpOpRequest>(ptr);
+ return boost::dynamic_pointer_cast< OPT >(ptr);
}
protected:
diff --git a/indra/llcorehttp/httprequest.cpp b/indra/llcorehttp/httprequest.cpp
index 1c7994927bd..e09f0c3b186 100755
--- a/indra/llcorehttp/httprequest.cpp
+++ b/indra/llcorehttp/httprequest.cpp
@@ -443,13 +443,13 @@ HttpStatus HttpRequest::update(long usecs)
++iter)
{
// Swap op pointer for NULL;
- op = *iter; *iter = NULL;
+ op.reset();
+ op.swap(*iter);
// Process operation
op->visitNotifier(this);
// We're done with the operation
- op.reset();
}
}
}
--
GitLab