| OLD | NEW |
| 1 /** | 1 /** |
| 2 * \file ATL_Deprecate.h Include package for all the ATL headers, with optional
forwarding to detect ATL dependencies. | 2 * \file ATL_Deprecate.h Include package for all the ATL headers, with optional
forwarding to detect ATL dependencies. |
| 3 * | 3 * |
| 4 * This header is a nexus for refactoring work to remove ATL. | 4 * This header is a nexus for refactoring work to remove ATL. |
| 5 * The main purpose of this mechanism is to determine the exact scope of the ref
actoring effort. | 5 * The main purpose of this mechanism is to determine the exact scope of the ref
actoring effort. |
| 6 * The lifetime of this header is during the work on #276 Stop using ATL https:/
/issues.adblockplus.org/ticket/276 | 6 * The lifetime of this header is during the work on #276 Stop using ATL https:/
/issues.adblockplus.org/ticket/276 |
| 7 * | 7 * |
| 8 * This file implements namespace forwarding that allows detection of ATL symbol
s. | 8 * This file implements namespace forwarding that allows detection of ATL symbol
s. |
| 9 * This forwarding is ordinarily disabled, and always disabled in Release config
uration for safety. | 9 * This forwarding is ordinarily disabled, and always disabled in Release config
uration for safety. |
| 10 * When forwarding is disabled, it simply includes the ATL headers. | 10 * When forwarding is disabled, it simply includes the ATL headers. |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 #endif | 121 #endif |
| 122 | 122 |
| 123 /* | 123 /* |
| 124 * Deprecation pragmas use the compiler to identify refactoring targets. | 124 * Deprecation pragmas use the compiler to identify refactoring targets. |
| 125 */ | 125 */ |
| 126 #if DISABLE_ATL_FORWARDING | 126 #if DISABLE_ATL_FORWARDING |
| 127 namespace ATL { | 127 namespace ATL { |
| 128 #else | 128 #else |
| 129 namespace OLD_ATL { | 129 namespace OLD_ATL { |
| 130 #endif | 130 #endif |
| 131 #pragma deprecated( CComBSTR ) | |
| 132 #pragma deprecated( CRect ) | |
| 133 #pragma deprecated( CSimpleArray ) | |
| 134 } | 131 } |
| 135 | 132 |
| 136 /* | 133 /* |
| 137 * Note: | 134 * Note: |
| 138 * The preprocessor symbols ATLASSERT and ATLTRACE appear in the source. | 135 * The preprocessor symbols ATLASSERT and ATLTRACE appear in the source. |
| 139 * These resolve to nothing in Release configurations. | 136 * These resolve to nothing in Release configurations. |
| 140 * In Debug configurations, these are non-trivial. | 137 * In Debug configurations, these are non-trivial. |
| 141 * ATLASSERT resolves to an expression with _CrtDbgReportW and _CrtDbgBreak. | 138 * ATLASSERT resolves to an expression with _CrtDbgReportW and _CrtDbgBreak. |
| 142 * ATLTRACE resolves to a ATL::CTraceFileAndLineInfo. | 139 * ATLTRACE resolves to a ATL::CTraceFileAndLineInfo. |
| 143 * These will need to be replaced or removed. | 140 * These will need to be replaced or removed. |
| (...skipping 23 matching lines...) Expand all Loading... |
| 167 * Reference argument usually does not require explicit temporaries. | 164 * Reference argument usually does not require explicit temporaries. |
| 168 */ | 165 */ |
| 169 std::wstring ToWstring(const ATL::CString& s); | 166 std::wstring ToWstring(const ATL::CString& s); |
| 170 std::wstring to_wstring(const ATL::CString& s); | 167 std::wstring to_wstring(const ATL::CString& s); |
| 171 | 168 |
| 172 /** | 169 /** |
| 173 * Conversion function from std::wstring to ATL::CString | 170 * Conversion function from std::wstring to ATL::CString |
| 174 */ | 171 */ |
| 175 ATL::CString ToCString(const std::wstring& s); | 172 ATL::CString ToCString(const std::wstring& s); |
| 176 ATL::CString to_CString(const std::wstring& s); | 173 ATL::CString to_CString(const std::wstring& s); |
| OLD | NEW |