Skip to content

Commit

Permalink
fix dll export
Browse files Browse the repository at this point in the history
  • Loading branch information
TShapinsky committed Oct 11, 2024
1 parent 66b50e3 commit 3014739
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/alfalfa/AlfalfaAPI.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# ifdef SHARED_OS_LIBS

# if defined(openstudio_utilities_EXPORTS) || defined(openstudio_EXPORTS)
# if defined(openstudio_alfalfa_EXPORTS) || defined(openstudio_EXPORTS)
# define ALFALFA_API __declspec(dllexport)
# define ALFALFA_TEMPLATE_EXT
# else
Expand Down
3 changes: 1 addition & 2 deletions src/model/AirConditionerVariableRefrigerantFlow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1736,8 +1736,7 @@ namespace model {
LOG(Warn, "Setting the Condenser Type to '" << condenserType << "', you should disconnect from its PlantLoop. "
<< "Occurred for " << briefDescription());
} else if (istringEqual("WaterCooled", condenserType) && !(this->plantLoop())) {
LOG(Warn, "Setting the Condenser Type to 'WaterCooled', you should connect it to a PlantLoop. "
<< "Occurred for " << briefDescription());
LOG(Warn, "Setting the Condenser Type to 'WaterCooled', you should connect it to a PlantLoop. " << "Occurred for " << briefDescription());
}

// ... but we still do it...
Expand Down
9 changes: 4 additions & 5 deletions src/osversion/VersionTranslator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,7 @@ namespace osversion {
// bracket allowable versions
LOG(Debug, "Starting translation from Version " << currentVersion.str() << ".");
if (currentVersion < VersionString("0.7.0")) {
LOG(Error, "Version translation is not provided for OpenStudio models created prior to "
<< "Version 0.7.0.");
LOG(Error, "Version translation is not provided for OpenStudio models created prior to " << "Version 0.7.0.");
return;
}
if (currentVersion > VersionString(openStudioVersion())) {
Expand Down Expand Up @@ -772,8 +771,8 @@ namespace osversion {
match = candidates[0];
}
if (match && match->name()) {
LOG(Warn, "Found match for object in OS:ComponentData contents list by type only, even "
<< "though this type of object (" << typeStr << ") has a name field.");
LOG(Warn, "Found match for object in OS:ComponentData contents list by type only, even " << "though this type of object (" << typeStr
<< ") has a name field.");
}
}

Expand Down Expand Up @@ -1096,7 +1095,7 @@ namespace osversion {
}
}
} // for keys
} // for users
} // for users
m_refactored.emplace_back(originalSchedule, schedule.idfObject());
for (const auto& candidate : candidates) {
model::ModelObjectVector wholeCandidate = getRecursiveChildren(candidate);
Expand Down

0 comments on commit 3014739

Please sign in to comment.