[ATL]

Various g++ fixes

svn path=/trunk/; revision=69518

diff --git a/reactos/lib/atl/atlcoll.h b/reactos/lib/atl/atlcoll.h
index 8ccabf5..251cba4 100644 (file)
--- a/reactos/lib/atl/atlcoll.h
+++ b/reactos/lib/atl/atlcoll.h
@@ -137,7 +137,6 @@ class CElementTraits :
 {
 };
 
-
 template<typename E, class ETraits = CElementTraits<E>>
 class CAtlList
 {
@@ -209,13 +208,12 @@ private:
 
 template<typename E, class ETraits>
 CAtlList< E, ETraits >::CAtlList(_In_ UINT nBlockSize) :
-    m_NumElements(0),
+    m_Blocks(NULL),
+    m_BlockSize(nBlockSize),
     m_HeadNode(NULL),
     m_TailNode(NULL),
     m_FreeNode(NULL),
-    m_Blocks(NULL),
-    
-    m_BlockSize(nBlockSize)
+    m_NumElements(0)
 {
     ATLASSERT(nBlockSize > 0);
 }

diff --git a/reactos/lib/atl/atlmem.h b/reactos/lib/atl/atlmem.h
index 580db03..2beb137 100644 (file)
--- a/reactos/lib/atl/atlmem.h
+++ b/reactos/lib/atl/atlmem.h
@@ -4,12 +4,6 @@
 #pragma once
 #include "atlcore.h"
 
-// HACK HACK! This must be placed in another global ATL header!!
-// Placement new operator
-void *operator new (size_t, void *buf)
-{
-    return buf;
-}
 
 namespace ATL
 {

diff --git a/reactos/lib/atl/atlsimpstr.h b/reactos/lib/atl/atlsimpstr.h
index 1c8828c..b2fb78c 100644 (file)
--- a/reactos/lib/atl/atlsimpstr.h
+++ b/reactos/lib/atl/atlsimpstr.h
@@ -102,20 +102,9 @@ public:
     wchar_t achNil[2];
 };
 
-template< typename BaseType = char >
-class ChTraitsBase
-{
-public:
-    typedef char XCHAR;
-    typedef LPSTR PXSTR;
-    typedef LPCSTR PCXSTR;
-    typedef wchar_t YCHAR;
-    typedef LPWSTR PYSTR;
-    typedef LPCWSTR PCYSTR;
-};
 
-template<>
-class ChTraitsBase< wchar_t >
+template< typename BaseType = wchar_t >
+class ChTraitsBase
 {
 public:
     typedef wchar_t XCHAR;
@@ -126,8 +115,6 @@ public:
     typedef LPCSTR PCYSTR;
 };
 
-
-
 template< typename BaseType, bool t_bMFCDLL = false>
 class CSimpleStringT
 {
@@ -156,12 +143,6 @@ public:
         Attach(pNewData);
     }
 
-    CSimpleStringT(_In_ const CSimpleStringT<BaseType, !t_bMFCDLL>& strSrc)
-    {
-        CStringData* pSrcData = strSrc.GetData();
-        CStringData* pNewData = CloneData(pSrcData);
-        Attach(pNewData);
-    }
 
     CSimpleStringT& operator=(_In_opt_z_ PCXSTR pszSrc)
     {

diff --git a/reactos/lib/atl/atlstr.h b/reactos/lib/atl/atlstr.h
index 866e053..58e633c 100644 (file)
--- a/reactos/lib/atl/atlstr.h
+++ b/reactos/lib/atl/atlstr.h
@@ -98,7 +98,15 @@ private:
 };
 
 
-template <typename _BaseType = char, class StringIterator = ChTraitsOS<_BaseType>>
+template< typename _CharType = wchar_t >
+class ChTraitsOS :
+    public ChTraitsBase < _CharType >
+{
+
+};
+
+
+template <typename _BaseType = wchar_t, class StringIterator = ChTraitsOS<_BaseType>>
 class StrTraitATL :
     public StringIterator
 {