Skip to content

refactor: Remove unused <atlconv.h> includes and add necessary headers for COM functionality #1534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nelson-numerical-software merged 1 commit into from
Jan 27, 2026
Merged

refactor: Remove unused <atlconv.h> includes and add necessary headers for COM functionality #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/com_engine/src/cpp/ActiveXServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// LICENCE_BLOCK_END
//=============================================================================
#include <Ole2.h>
#include <atlconv.h>
#include "ActiveXServer.hpp"
#include "Error.hpp"
#include "i18n.hpp"
Expand All @@ -17,6 +16,7 @@
//=============================================================================
namespace Nelson {
//=============================================================================
#define W2OLE(x) ((LPOLESTR)(x))
ComHandleObject*
ActiveXServer(const std::wstring& progId, const std::wstring& machine)
{
Expand Down
2 changes: 1 addition & 1 deletion modules/com_engine/src/cpp/ComHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
//=============================================================================
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <atlconv.h>
#include "ComHelpers.hpp"
#include "StringHelpers.hpp"
//=============================================================================
namespace Nelson {
//=============================================================================
#define W2OLE(x) ((LPOLESTR)(x))
bool
isMethodCom(IDispatch* pDisp, std::wstring methodToSearch)
{
Expand Down
2 changes: 1 addition & 1 deletion modules/com_engine/src/cpp/invokeCOM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
// LICENCE_BLOCK_END
//=============================================================================
#include <stdexcept>
#include <atlconv.h>
#include "invokeCOM.hpp"
#include "Error.hpp"
#include "i18n.hpp"
//=============================================================================
#define W2OLE(x) ((LPOLESTR)(x))
bool
invokeCom(int autoType, VARIANT* pvResult, std::wstring& errorMessage, IDispatch* pDisp,
std::wstring propertyName, int cArgs, VARIANT* pArgs)
Expand Down
1 change: 0 additions & 1 deletion modules/com_engine/src/cpp/invokeComHandleObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
//=============================================================================
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <atlconv.h>
#include "invokeComHandleObject.hpp"
#include "ComHandleObject.hpp"
#include "Error.hpp"
Expand Down
2 changes: 2 additions & 0 deletions modules/com_engine/src/include/VariantConversionHelpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
//=============================================================================
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <oaidl.h>
#include <oleauto.h>
#include "ArrayOf.hpp"
#include "nlsCom_engine_exports.h"
//=============================================================================
Expand Down
Loading