Skip to content

Update the namespace in platformIndependent since pi could conflict. #50

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
simpsont-oci merged 1 commit into from
Mar 4, 2026
Merged

Update the namespace in platformIndependent since pi could conflict. #50

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
8 changes: 4 additions & 4 deletions src/dds_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,14 @@ bool DDSManager::joinDomain(const int& domainID, const std::string& config, std:
m_config = config;

// If the user set the path to the DDS config file, use it
std::string dds_config_file_str = pi::GetEnvVar("DDS_CONFIG_FILE");
std::string dds_config_file_str = OpenDDW::GetEnvVar("DDS_CONFIG_FILE");
if (dds_config_file_str.empty())
{
// Use the current directory of the executable as the default
auto ddsConfigPath = pi::GetExecutableDirectory();
auto ddsConfigPath = OpenDDW::GetExecutableDirectory();
ddsConfigPath /= "opendds.ini";
if (!std::filesystem::exists(ddsConfigPath)) {
ddsConfigPath = pi::GetExecutableDirectory();
ddsConfigPath = OpenDDW::GetExecutableDirectory();
ddsConfigPath /= "..";
ddsConfigPath /= "opendds.ini";
}
Expand Down Expand Up @@ -268,7 +268,7 @@ bool DDSManager::joinDomain(const int& domainID, const std::string& config, std:
};

// Force using the specified NIC
ddsIP = pi::GetEnvVar("DDS_IP");
ddsIP = OpenDDW::GetEnvVar("DDS_IP");
if (ddsIP.empty())
{
m_messageHandler(LogMessageType::DDS_INFO, "The 'DDS_IP' environment variable was not set. Using default NIC for DDS.");
Expand Down
2 changes: 1 addition & 1 deletion src/platformIndependent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <mach-o/dyld.h>
#endif

namespace pi
namespace OpenDDW
{
/// Returns the full path to the executable currently running.
inline std::filesystem::path GetExecutablePath()
Expand Down
Loading