Skip to content

Commit 56bb2e3

Browse files
authored
Merge pull request #50 from doug1234/NamespaceChange
Update the namespace in platformIndependent since pi could conflict.
2 parents 4a98791 + d74c9a1 commit 56bb2e3

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/dds_manager.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,14 +212,14 @@ bool DDSManager::joinDomain(const int& domainID, const std::string& config, std:
212212
m_config = config;
213213

214214
// If the user set the path to the DDS config file, use it
215-
std::string dds_config_file_str = pi::GetEnvVar("DDS_CONFIG_FILE");
215+
std::string dds_config_file_str = OpenDDW::GetEnvVar("DDS_CONFIG_FILE");
216216
if (dds_config_file_str.empty())
217217
{
218218
// Use the current directory of the executable as the default
219-
auto ddsConfigPath = pi::GetExecutableDirectory();
219+
auto ddsConfigPath = OpenDDW::GetExecutableDirectory();
220220
ddsConfigPath /= "opendds.ini";
221221
if (!std::filesystem::exists(ddsConfigPath)) {
222-
ddsConfigPath = pi::GetExecutableDirectory();
222+
ddsConfigPath = OpenDDW::GetExecutableDirectory();
223223
ddsConfigPath /= "..";
224224
ddsConfigPath /= "opendds.ini";
225225
}
@@ -268,7 +268,7 @@ bool DDSManager::joinDomain(const int& domainID, const std::string& config, std:
268268
};
269269

270270
// Force using the specified NIC
271-
ddsIP = pi::GetEnvVar("DDS_IP");
271+
ddsIP = OpenDDW::GetEnvVar("DDS_IP");
272272
if (ddsIP.empty())
273273
{
274274
m_messageHandler(LogMessageType::DDS_INFO, "The 'DDS_IP' environment variable was not set. Using default NIC for DDS.");

src/platformIndependent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <mach-o/dyld.h>
88
#endif
99

10-
namespace pi
10+
namespace OpenDDW
1111
{
1212
/// Returns the full path to the executable currently running.
1313
inline std::filesystem::path GetExecutablePath()

0 commit comments

Comments
 (0)