Преглед изворни кода

HPCC-17670 Fix clashing class names

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday пре 8 година
родитељ
комит
86fefffaf7
3 измењених фајлова са 5 додато и 5 уклоњено
  1. 2 2
      dali/base/dacsds.cpp
  2. 1 1
      dali/base/dasds.cpp
  3. 2 2
      dali/base/dasds.ipp

+ 2 - 2
dali/base/dacsds.cpp

@@ -1544,7 +1544,7 @@ IPropertyTreeIterator *CClientSDSManager::getElements(CRemoteConnection &connect
             unsigned count;
             mb.read(count);
             CDisableFetchChangeBlock block(connection);
-            Owned<CPTArrayIterator> iter = new CPTArrayIterator();
+            Owned<DaliPTArrayIterator> iter = new DaliPTArrayIterator();
             while (count--)
             {
                 CClientRemoteTree *tree = new CClientRemoteTree(connection);
@@ -2071,7 +2071,7 @@ IPropertyTreeIterator *CClientSDSManager::getElementsRaw(const char *xpath, INod
     {
         case DAMP_SDSREPLY_OK:
         {
-            Owned<CPTArrayIterator> resultIterator = new CPTArrayIterator;
+            Owned<DaliPTArrayIterator> resultIterator = new DaliPTArrayIterator;
             unsigned count, c;
             mb.read(count);
             for (c=0; c<count; c++)

+ 1 - 1
dali/base/dasds.cpp

@@ -7017,7 +7017,7 @@ IPropertyTreeIterator *CCovenSDSManager::getElements(CRemoteConnection &connecti
     Owned<CLCReadLockBlock> lockBlock = new CLCReadLockBlock(dataRWLock, readWriteTimeout, __FILE__, __LINE__);
     CDisableFetchChangeBlock block(connection);
     Owned<CServerRemoteTree> serverConnRoot = (CServerRemoteTree *)getRegisteredTree(((CClientRemoteTree *)connection.queryRoot())->queryServerId());
-    Owned<CPTArrayIterator> elements = new CPTArrayIterator();
+    Owned<DaliPTArrayIterator> elements = new DaliPTArrayIterator();
     Owned<IPropertyTreeIterator> iter = serverConnRoot->getElements(xpath);
     ForEach (*iter)
     {

+ 2 - 2
dali/base/dasds.ipp

@@ -535,11 +535,11 @@ protected:
     CConnectionHashTable connections;
 };
 
-class CPTArrayIterator : public CArrayIteratorOf<IPropertyTree, IPropertyTreeIterator>
+class DaliPTArrayIterator : public CArrayIteratorOf<IPropertyTree, IPropertyTreeIterator>
 {
     DECL_NAMEDCOUNT;
 public:
-    CPTArrayIterator() : CArrayIteratorOf<IPropertyTree, IPropertyTreeIterator>(array) { INIT_NAMEDCOUNT; }
+    DaliPTArrayIterator() : CArrayIteratorOf<IPropertyTree, IPropertyTreeIterator>(array) { INIT_NAMEDCOUNT; }
     IArrayOf<IPropertyTree> array;
 };