[mapguide-commits] r9839 - in trunk/MgDev: Common/CoordinateSystem Common/MapGuideCommon/MapLayer Common/MdfParser/PrintLayout Common/PlatformBase/MapLayer Server/src/Common/Cache Server/src/Common/Manager Server/src/Core Server/src/Services/Drawing Server/src/Services/Feature Server/src/Services/Kml Server/src/Services/Mapping Server/src/Services/Profiling Server/src/Services/Rendering Server/src/Services/Resource Server/src/Services/ServerAdmin Server/src/Services/Site Server/src/Services/Tile Web/src/HttpHandler
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Apr 16 05:10:45 PDT 2021
Author: jng
Date: 2021-04-16 05:10:44 -0700 (Fri, 16 Apr 2021)
New Revision: 9839
Modified:
trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h
trunk/MgDev/Common/MapGuideCommon/MapLayer/Layer.cpp
trunk/MgDev/Common/MapGuideCommon/MapLayer/Selection.cpp
trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.h
trunk/MgDev/Common/MdfParser/PrintLayout/IOPropertyMappingCollection.h
trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp
trunk/MgDev/Server/src/Common/Cache/FeatureSourceCacheItem.h
trunk/MgDev/Server/src/Common/Cache/ResourceLayerDefinitionCacheItem.h
trunk/MgDev/Server/src/Common/Cache/SpatialContextCacheItem.h
trunk/MgDev/Server/src/Common/Manager/CacheManager.cpp
trunk/MgDev/Server/src/Common/Manager/SessionCache.cpp
trunk/MgDev/Server/src/Core/EventTimer.h
trunk/MgDev/Server/src/Core/ServiceHandlerFactory.cpp
trunk/MgDev/Server/src/Core/TimedEventHandler.cpp
trunk/MgDev/Server/src/Services/Drawing/DrawingOperationFactory.cpp
trunk/MgDev/Server/src/Services/Drawing/DrawingServiceHandler.cpp
trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.cpp
trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureOperationFactory.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureServiceHandler.cpp
trunk/MgDev/Server/src/Services/Feature/TransformCache.h
trunk/MgDev/Server/src/Services/Kml/KmlOperationFactory.cpp
trunk/MgDev/Server/src/Services/Kml/KmlServiceHandler.cpp
trunk/MgDev/Server/src/Services/Kml/ServerKmlService.cpp
trunk/MgDev/Server/src/Services/Mapping/LegendPlotUtil.cpp
trunk/MgDev/Server/src/Services/Mapping/MappingOperationFactory.cpp
trunk/MgDev/Server/src/Services/Mapping/MappingServiceHandler.cpp
trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
trunk/MgDev/Server/src/Services/Profiling/ProfilingOperationFactory.cpp
trunk/MgDev/Server/src/Services/Profiling/ProfilingServiceHandler.cpp
trunk/MgDev/Server/src/Services/Profiling/ServerProfilingService.cpp
trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp
trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp
trunk/MgDev/Server/src/Services/Rendering/RenderingOperationFactory.cpp
trunk/MgDev/Server/src/Services/Rendering/RenderingServiceHandler.cpp
trunk/MgDev/Server/src/Services/Resource/ApplicationRepositoryManager.cpp
trunk/MgDev/Server/src/Services/Resource/LibraryRepositoryManager.cpp
trunk/MgDev/Server/src/Services/Resource/RepositoryManager.cpp
trunk/MgDev/Server/src/Services/Resource/RepositoryManager.h
trunk/MgDev/Server/src/Services/Resource/ResourceContainer.h
trunk/MgDev/Server/src/Services/Resource/ResourceHeader.h
trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.cpp
trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.h
trunk/MgDev/Server/src/Services/Resource/ResourceOperationFactory.cpp
trunk/MgDev/Server/src/Services/Resource/ResourcePackageLoader.h
trunk/MgDev/Server/src/Services/Resource/ResourcePackageMaker.cpp
trunk/MgDev/Server/src/Services/Resource/ResourcePackageMaker.h
trunk/MgDev/Server/src/Services/Resource/ResourcePackageManifestHandler.h
trunk/MgDev/Server/src/Services/Resource/ResourceServiceHandler.cpp
trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp
trunk/MgDev/Server/src/Services/Resource/SiteResourceContentManager.cpp
trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp
trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminServiceHandler.cpp
trunk/MgDev/Server/src/Services/Site/SiteOperationFactory.cpp
trunk/MgDev/Server/src/Services/Site/SiteServiceHandler.cpp
trunk/MgDev/Server/src/Services/Tile/TileOperationFactory.cpp
trunk/MgDev/Server/src/Services/Tile/TileServiceHandler.cpp
trunk/MgDev/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp
trunk/MgDev/Web/src/HttpHandler/WmsMapUtil.cpp
Log:
Replace usages of auto_ptr with unique_ptr
Fixes #2837
Modified: trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -42,22 +42,22 @@
namespace MentorDictionary
{
template<class TCsMap, class TContainer >
- class TContainerPtr : public auto_ptr<TContainer>
+ class TContainerPtr : public unique_ptr<TContainer>
{
public:
TContainerPtr()
- : auto_ptr<TContainer>()
+ : unique_ptr<TContainer>()
{
}
TContainerPtr(TContainer* pContainer)
- : auto_ptr<TContainer>(pContainer)
+ : unique_ptr<TContainer>(pContainer)
{
}
~TContainerPtr()
{
- TContainer* pContainer = auto_ptr<TContainer>::get();
+ TContainer* pContainer = unique_ptr<TContainer>::get();
if (NULL == pContainer)
return;
@@ -195,7 +195,7 @@
{
//Make a collection to return - we first read all entries from the dictionary file
//and use those to fill up the dictionary we're returning
- auto_ptr<CSystemNameDescriptionMap> pmapSystemNameDescription(new CSystemNameDescriptionMap);
+ unique_ptr<CSystemNameDescriptionMap> pmapSystemNameDescription(new CSystemNameDescriptionMap);
for(typename vector<T>::size_type i = 0; i < csMapDefs->size(); ++i)
{
T* def = csMapDefs->at(i);
@@ -238,7 +238,7 @@
{
//Make a collection to return - we first read all entries from the dictionary file
//and use those to fill up the dictionary we're returning
- auto_ptr<CSystemNameDescriptionMap> pmapSystemNameDescription(new CSystemNameDescriptionMap);
+ unique_ptr<CSystemNameDescriptionMap> pmapSystemNameDescription(new CSystemNameDescriptionMap);
TContainerPtr<T, vector<T*> > allDictEntries(MentorDictionary::ReadDictionaryEntries(pFile, CS_Trd));
if (NULL == allDictEntries.get())
return NULL;
Modified: trunk/MgDev/Common/MapGuideCommon/MapLayer/Layer.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapLayer/Layer.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Common/MapGuideCommon/MapLayer/Layer.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -365,7 +365,7 @@
throw new MgInvalidFeatureSourceException(L"MgLayer::UpdateFeatures", __LINE__, __WFILE__, &arguments, L"", NULL);
}
- auto_ptr<MdfModel::FeatureSource> featureSource;
+ unique_ptr<MdfModel::FeatureSource> featureSource;
featureSource.reset(parser.DetachFeatureSource());
// Get the provider name.
Modified: trunk/MgDev/Common/MapGuideCommon/MapLayer/Selection.cpp
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapLayer/Selection.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Common/MapGuideCommon/MapLayer/Selection.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -70,7 +70,7 @@
Ptr<MgResourceIdentifier> layerid = layer->GetLayerDefinition();
Ptr<MgResourceService> resourceService = dynamic_cast<MgResourceService*>(
m_map->GetService(MgServiceType::ResourceService));
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resourceService, layerid));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(resourceService, layerid));
Ptr<MgStringCollection> propertyNames = new MgStringCollection();
if(ldf.get() != NULL)
{
Modified: trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.h
===================================================================
--- trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Common/MdfParser/PrintLayout/IOPrintLayoutElementCollection.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -42,7 +42,7 @@
IOPrintLayoutElementCollection& operator=(const IOPrintLayoutElementCollection&);
PrintLayoutElementCollection* m_layoutElems;
- auto_ptr<PrintLayoutElement> m_currElem;
+ unique_ptr<PrintLayoutElement> m_currElem;
};
END_NAMESPACE_MDFPARSER
Modified: trunk/MgDev/Common/MdfParser/PrintLayout/IOPropertyMappingCollection.h
===================================================================
--- trunk/MgDev/Common/MdfParser/PrintLayout/IOPropertyMappingCollection.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Common/MdfParser/PrintLayout/IOPropertyMappingCollection.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -42,7 +42,7 @@
IOPropertyMappingCollection& operator=(const IOPropertyMappingCollection&);
PropertyMappingCollection* m_propMappings;
- auto_ptr<PropertyMapping> m_currMapping;
+ unique_ptr<PropertyMapping> m_currMapping;
};
END_NAMESPACE_MDFPARSER
Modified: trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp
===================================================================
--- trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Common/PlatformBase/MapLayer/LayerBase.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -625,7 +625,7 @@
MG_TRY()
- auto_ptr<MdfModel::LayerDefinition> ldf;
+ unique_ptr<MdfModel::LayerDefinition> ldf;
if(!m_forceReadFromServer && m_resourceContent != L"")
{
ldf.reset(MgLayerBase::GetLayerDefinition(m_resourceContent));
Modified: trunk/MgDev/Server/src/Common/Cache/FeatureSourceCacheItem.h
===================================================================
--- trunk/MgDev/Server/src/Common/Cache/FeatureSourceCacheItem.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Common/Cache/FeatureSourceCacheItem.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -48,7 +48,7 @@
private:
- auto_ptr<MdfModel::FeatureSource> m_featureSource;
+ unique_ptr<MdfModel::FeatureSource> m_featureSource;
};
/// Inline Methods
Modified: trunk/MgDev/Server/src/Common/Cache/ResourceLayerDefinitionCacheItem.h
===================================================================
--- trunk/MgDev/Server/src/Common/Cache/ResourceLayerDefinitionCacheItem.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Common/Cache/ResourceLayerDefinitionCacheItem.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -50,7 +50,7 @@
private:
- auto_ptr<MdfModel::LayerDefinition> m_layerDefinition;
+ unique_ptr<MdfModel::LayerDefinition> m_layerDefinition;
};
/// Inline Methods
Modified: trunk/MgDev/Server/src/Common/Cache/SpatialContextCacheItem.h
===================================================================
--- trunk/MgDev/Server/src/Common/Cache/SpatialContextCacheItem.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Common/Cache/SpatialContextCacheItem.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -49,7 +49,7 @@
private:
- auto_ptr<MgSpatialContextInfo> m_spatialContextInfo;
+ unique_ptr<MgSpatialContextInfo> m_spatialContextInfo;
};
/// Inline Methods
Modified: trunk/MgDev/Server/src/Common/Manager/CacheManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/CacheManager.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Common/Manager/CacheManager.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -265,7 +265,7 @@
// Detach the feature source from the parser.
// It's now the caller's responsibility to delete it.
- auto_ptr<MdfModel::FeatureSource> featureSource;
+ unique_ptr<MdfModel::FeatureSource> featureSource;
featureSource.reset(parser.DetachFeatureSource());
if (NULL == featureSource.get())
@@ -318,7 +318,7 @@
featureSource->GetSupplementalSpatialContextInfo();
CHECKNULL(spatialContexts, L"MgCacheManager.GetSpatialContextCacheItem");
- auto_ptr<MgSpatialContextInfo> spatialContextInfo;
+ unique_ptr<MgSpatialContextInfo> spatialContextInfo;
spatialContextInfo.reset(new MgSpatialContextInfo());
for (int i = 0; i < spatialContexts->GetCount(); ++i)
@@ -412,7 +412,7 @@
m_serviceManager->RequestService(MgServiceType::ResourceService));
ACE_ASSERT(NULL != resourceService.p);
- auto_ptr<MdfModel::LayerDefinition> layerDefinition;
+ unique_ptr<MdfModel::LayerDefinition> layerDefinition;
layerDefinition.reset(MgLayerBase::GetLayerDefinition(resourceService, resource));
if (NULL == layerDefinition.get())
Modified: trunk/MgDev/Server/src/Common/Manager/SessionCache.cpp
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/SessionCache.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Common/Manager/SessionCache.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -89,7 +89,7 @@
{
if (m_sessionInfoMap.end() == m_sessionInfoMap.find(session))
{
- auto_ptr<MgSessionInfo> sessionInfo;
+ unique_ptr<MgSessionInfo> sessionInfo;
sessionInfo.reset(new MgSessionInfo());
sessionInfo->SetUser(user);
Modified: trunk/MgDev/Server/src/Core/EventTimer.h
===================================================================
--- trunk/MgDev/Server/src/Core/EventTimer.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Core/EventTimer.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -82,7 +82,7 @@
long m_id;
ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> m_timer;
INT32 m_interval;
- auto_ptr<MgTimedEventHandler> m_eventHandler;
+ unique_ptr<MgTimedEventHandler> m_eventHandler;
};
/// Inline Methods
Modified: trunk/MgDev/Server/src/Core/ServiceHandlerFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Core/ServiceHandlerFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Core/ServiceHandlerFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -30,7 +30,7 @@
#include "ProfilingServiceHandler.h"
// References the static singleton MgServiceHandlerFactory object
-static auto_ptr<MgServiceHandlerFactory> s_pFactory;
+static unique_ptr<MgServiceHandlerFactory> s_pFactory;
//-------------------------------------------------------------------------
// Constructors/Destructors
Modified: trunk/MgDev/Server/src/Core/TimedEventHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Core/TimedEventHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Core/TimedEventHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -49,7 +49,7 @@
CHECKNULL(serverManager, L"MgTimedEventHandler.Create");
- auto_ptr<MgTimedEventHandler> eventHandler;
+ unique_ptr<MgTimedEventHandler> eventHandler;
bool isSiteServer = serverManager->IsSiteServer();
switch (type)
Modified: trunk/MgDev/Server/src/Services/Drawing/DrawingOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/DrawingOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Drawing/DrawingOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -64,7 +64,7 @@
IMgOperationHandler* MgDrawingOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Drawing/DrawingServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/DrawingServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Drawing/DrawingServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgDrawingServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -100,7 +100,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.DescribeDrawing");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Obtain the manifest from the DWF.
DWFInputStream* pStream = reader->extract(MANIFEST_XML.c_str(), false);
@@ -185,7 +185,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.GetSection");
CHECKARGUMENTEMPTYSTRING(sectionName, L"MgServerDrawingService.GetSection");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest (and get the mime type from the manifest)
DWFManifest& manifest = reader->getManifest();
@@ -277,7 +277,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.GetSectionResource");
CHECKARGUMENTEMPTYSTRING(resourceName, L"MgServerDrawingService.GetSectionResource");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Parse the section name from the resourceName
STRING::size_type index = resourceName.rfind(RESOURCENAME_SEPARATOR);
@@ -396,7 +396,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.EnumerateLayers");
CHECKARGUMENTEMPTYSTRING(sectionName, L"MgServerDrawingService.EnumerateLayers");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest
DWFManifest& manifest = reader->getManifest();
@@ -539,7 +539,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.GetLayer");
CHECKARGUMENTEMPTYSTRING(sectionName, L"MgServerDrawingService.GetLayer");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest
DWFManifest& manifest = reader->getManifest();
@@ -808,7 +808,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.EnumerateSections");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Get the ePlot sections in the DWF
DWFManifest& manifest = reader->getManifest();
@@ -927,7 +927,7 @@
CHECKARGUMENTNULL(resource, L"MgServerDrawingService.EnumerateSectionResources");
CHECKARGUMENTEMPTYSTRING(sectionName, L"MgServerDrawingService.EnumerateSectionResources");
{
- auto_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
+ unique_ptr<DWFPackageReader> reader(MgServerDrawingServiceUtil::OpenDrawingResource(m_resourceService, resource, m_bOpenTempDwfFile, m_tempDwfFileName));
// Check if the section exists in the manifest
DWFManifest& manifest = reader->getManifest();
Modified: trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Drawing/ServerDrawingServiceUtil.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -302,7 +302,7 @@
bool& bOpenTempFile, REFSTRING tempFileName)
{
Ptr<MgByteReader> byteReader;
- auto_ptr<DWFPackageReader> reader;
+ unique_ptr<DWFPackageReader> reader;
MG_SERVER_DRAWING_SERVICE_TRY()
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -103,7 +103,7 @@
IMgOperationHandler* MgFeatureOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgFeatureServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Feature/TransformCache.h
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/TransformCache.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Feature/TransformCache.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -52,7 +52,7 @@
private:
static ACE_Recursive_Thread_Mutex sm_mutex;
- auto_ptr<MgCSTrans> m_xform;
+ unique_ptr<MgCSTrans> m_xform;
Ptr<MgCoordinateSystem> m_coordSys;
Ptr<MgCoordinateSystemTransform> m_transform;
Ptr<MgEnvelope> m_envelope;
Modified: trunk/MgDev/Server/src/Services/Kml/KmlOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/KmlOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Kml/KmlOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -56,7 +56,7 @@
IMgOperationHandler* MgKmlOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Kml/KmlServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/KmlServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Kml/KmlServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgKmlServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Kml/ServerKmlService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/ServerKmlService.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Kml/ServerKmlService.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -76,7 +76,7 @@
Ptr<MgResourceIdentifier> mapResId = map->GetMapDefinition();
//get the map definition
- auto_ptr<MdfModel::MapDefinition> mdf(MgMappingUtil::GetMapDefinition(m_svcResource, mapResId));
+ unique_ptr<MdfModel::MapDefinition> mdf(MgMappingUtil::GetMapDefinition(m_svcResource, mapResId));
STRING metadata = mdf->GetMetadata();
if(!metadata.empty())
@@ -147,7 +147,7 @@
//get layer definition
Ptr<MgResourceIdentifier> resId = layer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
KmlContent kmlContent;
kmlContent.StartDocument();
@@ -245,7 +245,7 @@
InitializeResourceService();
}
Ptr<MgResourceIdentifier> resId = layer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(ldf.get());
if(gl != NULL)
{
@@ -896,7 +896,7 @@
STRING strCategoryIndex = L"-1";
//get layer definition
Ptr<MgResourceIdentifier> resId = layer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resId));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
if(vl != NULL)
Modified: trunk/MgDev/Server/src/Services/Mapping/LegendPlotUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/LegendPlotUtil.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Mapping/LegendPlotUtil.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -293,7 +293,7 @@
continue;
Ptr<MgResourceIdentifier> layerid = mapLayer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
// Get bitmaps for rules/themes
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
@@ -588,7 +588,7 @@
//Reserve space for rules in the legend
// Get layer definition
Ptr<MgResourceIdentifier> layerid = mapLayer->GetLayerDefinition();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, layerid));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
MdfModel::DrawingLayerDefinition* dl = dynamic_cast<MdfModel::DrawingLayerDefinition*>(ldf.get());
Modified: trunk/MgDev/Server/src/Services/Mapping/MappingOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/MappingOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Mapping/MappingOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -70,7 +70,7 @@
IMgOperationHandler* MgMappingOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
switch (operationId)
Modified: trunk/MgDev/Server/src/Services/Mapping/MappingServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/MappingServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Mapping/MappingServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -65,7 +65,7 @@
IMgServiceHandler::MgProcessStatus MgMappingServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -952,7 +952,7 @@
if (m_svcResource == NULL)
InitializeResourceService();
- auto_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resource));
+ unique_ptr<MdfModel::LayerDefinition> ldf(MgLayerBase::GetLayerDefinition(m_svcResource, resource));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(ldf.get());
MdfModel::DrawingLayerDefinition* dl = dynamic_cast<MdfModel::DrawingLayerDefinition*>(ldf.get());
MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(ldf.get());
Modified: trunk/MgDev/Server/src/Services/Profiling/ProfilingOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Profiling/ProfilingOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Profiling/ProfilingOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -55,7 +55,7 @@
IMgOperationHandler* MgProfilingOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Profiling/ProfilingServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Profiling/ProfilingServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Profiling/ProfilingServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgProfilingServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Profiling/ServerProfilingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Profiling/ServerProfilingService.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Profiling/ServerProfilingService.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -59,7 +59,7 @@
MG_TRY()
CHECKARGUMENTNULL(map, L"MgServerProfilingService.ProfileRenderDynamicOverlay");
- auto_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
+ unique_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
pPRMResult.reset(new ProfileRenderMapResult());
// Start to profile the ProfileRenderDynamicOverlay process
@@ -72,7 +72,7 @@
// Serialize the ProfileRenderMapResult to xml
MdfParser::SAX2Parser parser;
- auto_ptr<Version> version;
+ unique_ptr<Version> version;
version.reset(new Version(2,4,0));
string content = parser.SerializeToXML(pPRMResult.get(),version.get());
ret = new MgByteReader(MgUtil::MultiByteToWideChar(content), MgMimeType::Xml);
@@ -98,7 +98,7 @@
MG_TRY()
CHECKARGUMENTNULL(map, L"MgServerProfilingService.ProfileRenderMap");
- auto_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
+ unique_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
pPRMResult.reset(new ProfileRenderMapResult());
// Start to profile the ProfileRenderMap process
@@ -111,7 +111,7 @@
// Serialize the ProfileRenderMapResult to xml
MdfParser::SAX2Parser parser;
- auto_ptr<Version> version;
+ unique_ptr<Version> version;
version.reset(new Version(2,4,0));
string content = parser.SerializeToXML(pPRMResult.get(),version.get());
ret = new MgByteReader(MgUtil::MultiByteToWideChar(content), MgMimeType::Xml);
Modified: trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -120,7 +120,7 @@
Ptr<MgRenderingOptions> options = (MgRenderingOptions*)m_stream->GetObject();
- auto_ptr<ProfileRenderMapResult> pProfileRenderMapResult;
+ unique_ptr<ProfileRenderMapResult> pProfileRenderMapResult;
pProfileRenderMapResult.reset((ProfileRenderMapResult*)m_stream->GetObject());
BeginExecution();
Modified: trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -441,7 +441,7 @@
}
else
{
- auto_ptr<ProfileRenderMapResult> pProfileRenderMapResult;
+ unique_ptr<ProfileRenderMapResult> pProfileRenderMapResult;
pProfileRenderMapResult.reset((ProfileRenderMapResult*)m_stream->GetObject());
BeginExecution();
Modified: trunk/MgDev/Server/src/Services/Rendering/RenderingOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/RenderingOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Rendering/RenderingOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -55,7 +55,7 @@
IMgOperationHandler* MgRenderingOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Rendering/RenderingServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/RenderingServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Rendering/RenderingServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgRenderingServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Resource/ApplicationRepositoryManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ApplicationRepositoryManager.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ApplicationRepositoryManager.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -560,7 +560,7 @@
bool overwrite)
{
assert(NULL != sourceResource && NULL != destResource) ;
- auto_ptr<MgApplicationRepositoryManager> sourceRepositoryMan;
+ unique_ptr<MgApplicationRepositoryManager> sourceRepositoryMan;
MG_RESOURCE_SERVICE_TRY()
Modified: trunk/MgDev/Server/src/Services/Resource/LibraryRepositoryManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/LibraryRepositoryManager.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/LibraryRepositoryManager.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -173,7 +173,7 @@
bool logActivities)
{
ACE_ASSERT(!packagePathname.empty());
- auto_ptr<MgResourcePackageLoader> packageLoader;
+ unique_ptr<MgResourcePackageLoader> packageLoader;
MG_RESOURCE_SERVICE_TRY()
@@ -200,7 +200,7 @@
{
ACE_ASSERT(NULL != resource && !packagePathname.empty());
- auto_ptr<MgResourcePackageMaker> packageMaker;
+ unique_ptr<MgResourcePackageMaker> packageMaker;
MG_RESOURCE_SERVICE_TRY()
Modified: trunk/MgDev/Server/src/Services/Resource/RepositoryManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/RepositoryManager.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/RepositoryManager.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -41,7 +41,7 @@
m_currUserIsAdmin(false),
m_currUserIsAuthor(false),
m_dbTxn(NULL),
- m_xmlTxn(NULL)
+ m_xmlTxn((XmlTransaction*)NULL)
{
// Set the source and destination repository managers are the same by default.
m_sourceRepositoryMan = this;
Modified: trunk/MgDev/Server/src/Services/Resource/RepositoryManager.h
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/RepositoryManager.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/RepositoryManager.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -112,7 +112,7 @@
protected:
- auto_ptr<MgSecurityManager> m_securityMan;
+ unique_ptr<MgSecurityManager> m_securityMan;
Ptr<MgUserInformation> m_currUserInfo;
bool m_currUserIsAdmin;
@@ -121,7 +121,7 @@
MgRepositoryManager* m_sourceRepositoryMan;
DbTxn* m_dbTxn;
- auto_ptr<XmlTransaction> m_xmlTxn;
+ unique_ptr<XmlTransaction> m_xmlTxn;
time_t m_accessedTime;
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceContainer.h
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceContainer.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceContainer.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -55,7 +55,7 @@
private:
- auto_ptr<XmlContainer> m_xmlContainer;
+ unique_ptr<XmlContainer> m_xmlContainer;
};
/// Inline Methods
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceHeader.h
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceHeader.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceHeader.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -76,12 +76,12 @@
private:
- auto_ptr<MgXmlUtil> m_xmlUtil;
+ unique_ptr<MgXmlUtil> m_xmlUtil;
INT32 m_properties;
INT32 m_numFolders;
INT32 m_numDocuments;
bool m_inherited;
- auto_ptr<MgResourceInfo> m_resourceInfo;
+ unique_ptr<MgResourceInfo> m_resourceInfo;
bool m_securityInfoFromParent;
};
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -1089,7 +1089,7 @@
// Write the resource list.
- auto_ptr<MgResourceHeader> resourceHeader;
+ unique_ptr<MgResourceHeader> resourceHeader;
resourceHeader.reset(new MgResourceHeader());
resourceHeader->Initialize(currResource, xmlDoc, properties);
@@ -1543,7 +1543,7 @@
XmlQueryExpression& selectGroupNames,
XmlQueryExpression& selectGroupPermissions)
{
- auto_ptr<MgPermissionInfo> permissionInfo;
+ unique_ptr<MgPermissionInfo> permissionInfo;
MG_RESOURCE_SERVICE_TRY()
@@ -1998,7 +1998,7 @@
MgPermissionCache* permissionCache)
{
assert(NULL != permissionCache);
- auto_ptr<MgPermissionInfo> permissionInfo;
+ unique_ptr<MgPermissionInfo> permissionInfo;
MG_RESOURCE_SERVICE_TRY()
@@ -2782,7 +2782,7 @@
// Allow only the owner or the Administrator to change the permission
// information.
- auto_ptr<MgPermissionInfo> oldPermissionInfo(CreatePermissionInfo(
+ unique_ptr<MgPermissionInfo> oldPermissionInfo(CreatePermissionInfo(
xmlDoc, queryContext,
selectInheritedFlags,
selectUserNames, selectUserPermissions,
@@ -2791,7 +2791,7 @@
xmlDoc.setContent(xmlStr);
- auto_ptr<MgPermissionInfo> newPermissionInfo(CreatePermissionInfo(
+ unique_ptr<MgPermissionInfo> newPermissionInfo(CreatePermissionInfo(
xmlDoc, queryContext,
selectInheritedFlags,
selectUserNames, selectUserPermissions,
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.h
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceHeaderManager.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -171,7 +171,7 @@
friend class MgLibraryRepositoryManager;
- auto_ptr<MgPermissionManager> m_permissionMan;
+ unique_ptr<MgPermissionManager> m_permissionMan;
Ptr<MgPermissionCache> m_permissionCache;
string m_defaultRootHeader;
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -94,7 +94,7 @@
IMgOperationHandler* MgResourceOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_RESOURCE_SERVICE_TRY()
Modified: trunk/MgDev/Server/src/Services/Resource/ResourcePackageLoader.h
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourcePackageLoader.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourcePackageLoader.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -72,7 +72,7 @@
private:
- auto_ptr<MgZipFileReader> m_zipFileReader;
+ unique_ptr<MgZipFileReader> m_zipFileReader;
MgResourcePackageManifestParser m_manifestParser;
};
Modified: trunk/MgDev/Server/src/Services/Resource/ResourcePackageMaker.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourcePackageMaker.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourcePackageMaker.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -168,7 +168,7 @@
GeneratePathnames(resource, postfix, resourcePathname, archivePathname);
// Initialize the operation information.
- auto_ptr<MgOperationInfo> opInfo;
+ unique_ptr<MgOperationInfo> opInfo;
if (resource.IsRoot())
{
@@ -269,7 +269,7 @@
if (!resource.IsFolder())
{
// Initialize the operation information.
- auto_ptr<MgOperationInfo> opInfo;
+ unique_ptr<MgOperationInfo> opInfo;
opInfo.reset(new MgOperationInfo(MgOperationName::DeleteResource));
MgOperationParameter opParam;
@@ -337,7 +337,7 @@
GeneratePathnames(resource, postfix, resourcePathname, archivePathname);
// Initialize the operation information.
- auto_ptr<MgOperationInfo> opInfo;
+ unique_ptr<MgOperationInfo> opInfo;
opInfo.reset(new MgOperationInfo(MgOperationName::SetResourceData));
MgOperationParameter opParam;
Modified: trunk/MgDev/Server/src/Services/Resource/ResourcePackageMaker.h
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourcePackageMaker.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourcePackageMaker.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -66,7 +66,7 @@
private:
- auto_ptr<MgZipFileWriter> m_zipFileWriter;
+ unique_ptr<MgZipFileWriter> m_zipFileWriter;
MgResourcePackageManifestSerializer m_manifestSerializer;
MgResourceOperationMap m_resourceOperationMap;
Modified: trunk/MgDev/Server/src/Services/Resource/ResourcePackageManifestHandler.h
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourcePackageManifestHandler.h 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourcePackageManifestHandler.h 2021-04-16 12:10:44 UTC (rev 9839)
@@ -52,7 +52,7 @@
protected:
- auto_ptr<MgXmlUtil> m_xmlUtil;
+ unique_ptr<MgXmlUtil> m_xmlUtil;
STRING m_description;
};
Modified: trunk/MgDev/Server/src/Services/Resource/ResourceServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ResourceServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ResourceServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -64,7 +64,7 @@
IMgServiceHandler::MgProcessStatus MgResourceServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/ServerResourceService.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -290,7 +290,7 @@
if(sm_bSingleSessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sm_sessionRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -310,7 +310,7 @@
if(0 == sm_sessionRepositories.size())
{
// Since there are no sessions yet we will need to check access rights ourselves
- auto_ptr<MgSecurityManager> securityMan;
+ unique_ptr<MgSecurityManager> securityMan;
securityMan.reset(new MgSecurityManager());
Ptr<MgUserInformation> currUserInfo = MgUserInformation::GetCurrentUserInfo();
@@ -352,7 +352,7 @@
MgSessionRepository* sessionRepository = i->second;
if(NULL != sessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sessionRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -414,7 +414,7 @@
if(sm_bSingleSessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sm_sessionRepository));
int maxRetries = sm_retryAttempts;
@@ -442,7 +442,7 @@
}
else
{
- auto_ptr<MgSecurityManager> securityMan;
+ unique_ptr<MgSecurityManager> securityMan;
securityMan.reset(new MgSecurityManager());
Ptr<MgUserInformation> currUserInfo = MgUserInformation::GetCurrentUserInfo();
@@ -497,7 +497,7 @@
// Initialize the session repository
sessionRepository->Initialize();
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sessionRepository));
int maxRetries = sm_retryAttempts;
@@ -563,7 +563,7 @@
L"MgServerResourceService.DeleteRepository", __LINE__, __WFILE__, NULL, L"", NULL);
}
- auto_ptr<MgSecurityManager> securityMan;
+ unique_ptr<MgSecurityManager> securityMan;
securityMan.reset(new MgSecurityManager());
Ptr<MgUserInformation> currUserInfo = MgUserInformation::GetCurrentUserInfo();
@@ -592,7 +592,7 @@
if(sm_bSingleSessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sm_sessionRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -615,7 +615,7 @@
MgSessionRepository* sessionRepository = iter->second;
if(NULL != sessionRepository)
{
- auto_ptr<MgSessionRepositoryManager> repositoryMan(
+ unique_ptr<MgSessionRepositoryManager> repositoryMan(
new MgSessionRepositoryManager(*sessionRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -670,7 +670,7 @@
L"MgServerResourceService.UpdateRepository", __LINE__, __WFILE__, NULL, L"", NULL);
}
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
int maxRetries = sm_retryAttempts;
@@ -720,7 +720,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.GetRepositoryContent");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -763,7 +763,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -789,7 +789,7 @@
CHECKARGUMENTNULL(packageStream, L"MgServerResourceService.ApplyResourcePackage");
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
int maxRetries = sm_retryAttempts;
@@ -836,7 +836,7 @@
__LINE__, __WFILE__, &arguments, L"", NULL);
}
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -880,7 +880,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -907,7 +907,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.ResourceExists");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -951,7 +951,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -989,7 +989,7 @@
logDetail.AddInt64(L"HeaderSize", NULL != header ? header->GetLength() : 0);
logDetail.Create();
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
int maxRetries = sm_retryAttempts;
@@ -1041,7 +1041,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.DeleteResource");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1081,7 +1081,7 @@
CHECKARGUMENTNULL(sourceResource, L"MgServerResourceService.MoveResource");
CHECKARGUMENTNULL(destResource, L"MgServerResourceService.MoveResource");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(destResource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1116,7 +1116,7 @@
CHECKARGUMENTNULL(sourceResource, L"MgServerResourceService.CopyResource");
CHECKARGUMENTNULL(destResource, L"MgServerResourceService.CopyResource");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(destResource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1155,7 +1155,7 @@
logDetail.AddString(L"Tags", preProcessTags);
logDetail.Create();
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1198,7 +1198,7 @@
Ptr<MgResourceIdentifier> resourceId = new MgResourceIdentifier(resource);
Ptr<MgByteReader> byteReader;
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resourceId));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1246,7 +1246,7 @@
logDetail.Create();
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1290,7 +1290,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1325,7 +1325,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.EnumerateReferences");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1601,7 +1601,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::EnumerateResourceDocuments()");
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1644,7 +1644,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1683,7 +1683,7 @@
}
ACE_ASSERT(resource->GetRepositoryName().empty());
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1716,7 +1716,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.EnumerateResourceData");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1757,7 +1757,7 @@
logDetail.AddInt64(L"Size", data->GetLength());
logDetail.Create();
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
int maxRetries = sm_retryAttempts;
@@ -1803,7 +1803,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.DeleteResourceData");
CHECKARGUMENTEMPTYSTRING(dataName, L"MgServerResourceService.DeleteResourceData");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1839,7 +1839,7 @@
CHECKARGUMENTEMPTYSTRING(oldDataName, L"MgServerResourceService.RenameResourceData");
CHECKARGUMENTEMPTYSTRING(newDataName, L"MgServerResourceService.RenameResourceData");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1881,7 +1881,7 @@
logDetail.AddString(L"Tags", preProcessTags);
logDetail.Create();
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -1910,7 +1910,7 @@
MgResourceIdentifier* resource)
{
ACE_ASSERT(NULL != resource);
- auto_ptr<MgApplicationRepositoryManager> repositoryMan;
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan;
STRING repositoryType = resource->GetRepositoryType();
MG_RESOURCE_SERVICE_TRY()
@@ -1984,7 +1984,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::EnumerateUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2016,7 +2016,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::AddUser()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2044,7 +2044,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::DeleteUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2073,7 +2073,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::UpdateUser()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2105,7 +2105,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::EnumerateGroups()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2134,7 +2134,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::AddGroup()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2161,7 +2161,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::DeleteGroups()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2190,7 +2190,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::UpdateGroup()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2228,7 +2228,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::GrantGroupMembershipsToUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2266,7 +2266,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::RevokeGroupMembershipsFromUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2312,7 +2312,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::EnumerateRoles()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2378,7 +2378,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::GrantRoleMembershipsToUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2416,7 +2416,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::RevokeRoleMembershipsFromUsers()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2454,7 +2454,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::GrantRoleMembershipsToGroups()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2492,7 +2492,7 @@
MG_LOG_TRACE_ENTRY(L"MgServerResourceService::RevokeRoleMembershipsFromGroups()");
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2516,7 +2516,7 @@
MG_RESOURCE_SERVICE_TRY()
- auto_ptr<MgSiteRepositoryManager> repositoryMan(
+ unique_ptr<MgSiteRepositoryManager> repositoryMan(
new MgSiteRepositoryManager(*sm_siteRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2547,7 +2547,7 @@
MG_RESOURCE_SERVICE_TRY()
- auto_ptr<MgLibraryRepositoryManager> repositoryMan(
+ unique_ptr<MgLibraryRepositoryManager> repositoryMan(
new MgLibraryRepositoryManager(*sm_libraryRepository));
MG_RESOURCE_SERVICE_BEGIN_OPERATION()
@@ -2580,7 +2580,7 @@
CHECKARGUMENTNULL(resource, L"MgServerResourceService.CheckPermission");
- auto_ptr<MgApplicationRepositoryManager> repositoryMan(
+ unique_ptr<MgApplicationRepositoryManager> repositoryMan(
CreateApplicationRepositoryManager(resource));
MgResourceContentManager* resourceContentMan =
repositoryMan->GetResourceContentManager();
Modified: trunk/MgDev/Server/src/Services/Resource/SiteResourceContentManager.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/SiteResourceContentManager.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Resource/SiteResourceContentManager.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -2388,9 +2388,9 @@
STRING resourcePathname;
STRING name, password;
- auto_ptr<MgUserInfo> userInfo;
- auto_ptr<MgGroupInfo> groupInfo;
- auto_ptr<MgRoleInfo> roleInfo;
+ unique_ptr<MgUserInfo> userInfo;
+ unique_ptr<MgGroupInfo> groupInfo;
+ unique_ptr<MgRoleInfo> roleInfo;
XmlDocument xmlDoc;
Modified: trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -88,7 +88,7 @@
IMgOperationHandler* MgServerAdminOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -68,7 +68,7 @@
IMgServiceHandler::MgProcessStatus MgServerAdminServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Site/SiteOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Site/SiteOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Site/SiteOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -100,7 +100,7 @@
IMgOperationHandler* MgSiteOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_SITE_SERVICE_TRY()
Modified: trunk/MgDev/Server/src/Services/Site/SiteServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Site/SiteServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Site/SiteServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgSiteServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Tile/TileOperationFactory.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Tile/TileOperationFactory.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Tile/TileOperationFactory.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -55,7 +55,7 @@
IMgOperationHandler* MgTileOperationFactory::GetOperation(
ACE_UINT32 operationId, ACE_UINT32 operationVersion)
{
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Server/src/Services/Tile/TileServiceHandler.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Tile/TileServiceHandler.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Server/src/Services/Tile/TileServiceHandler.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -67,7 +67,7 @@
IMgServiceHandler::MgProcessStatus MgTileServiceHandler::ProcessOperation()
{
IMgServiceHandler::MgProcessStatus status = IMgServiceHandler::mpsError;
- auto_ptr<IMgOperationHandler> handler;
+ unique_ptr<IMgOperationHandler> handler;
MG_TRY()
Modified: trunk/MgDev/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Web/src/HttpHandler/HttpWfsDescribeFeatureType.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -88,7 +88,7 @@
Ptr<MgFeatureService> pFeatureService = (MgFeatureService*)(CreateService(MgServiceType::FeatureService));
// Retrieve feature definitions
- auto_ptr<MgWfsFeatureDefinitions> pFeatureTypes;
+ unique_ptr<MgWfsFeatureDefinitions> pFeatureTypes;
if(NULL == featureTypeList)
{
pFeatureTypes.reset(new MgWfsFeatureDefinitions(pResourceService,pFeatureService));
Modified: trunk/MgDev/Web/src/HttpHandler/WmsMapUtil.cpp
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/WmsMapUtil.cpp 2021-04-16 09:36:32 UTC (rev 9838)
+++ trunk/MgDev/Web/src/HttpHandler/WmsMapUtil.cpp 2021-04-16 12:10:44 UTC (rev 9839)
@@ -192,7 +192,7 @@
else
{
// Get layer definition from the original layer
- auto_ptr<MdfModel::LayerDefinition> layerDef;
+ unique_ptr<MdfModel::LayerDefinition> layerDef;
layerDef.reset(mgLayer->GetLayerDefinition(resourceService,resId));
MdfModel::VectorLayerDefinition* vl = dynamic_cast<MdfModel::VectorLayerDefinition*>(layerDef.get());
MdfModel::GridLayerDefinition* gl = dynamic_cast<MdfModel::GridLayerDefinition*>(layerDef.get());
More information about the mapguide-commits
mailing list