Skip to content

Commit ce19dc4

Browse files
committed
Fix unresolved merge conflict, which caused build break
1 parent c695465 commit ce19dc4

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Release/src/utilities/asyncrt_utils.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,6 @@ datetime __cdecl datetime::from_string(const utility::string_t& dateString, date
826826
input = m[1].str() + m[3].str();
827827
}
828828
#else
829-
std::regex r_frac_second2("(.+)(\\.\\d+)(Z$)");
830829
// Try to extract the fractional second from the timestamp
831830
boost::regex r_frac_second("(.+)(\\.\\d+)(Z$)");
832831
boost::smatch m;
@@ -836,7 +835,7 @@ datetime __cdecl datetime::from_string(const utility::string_t& dateString, date
836835
ufrac_second = timeticks_from_second(frac);
837836
input = m[1].str() + m[3].str();
838837
}
839-
838+
#endif
840839
auto result = strptime(input.data(), "%Y-%m-%dT%H:%M:%SZ", &output);
841840

842841
if ( result == nullptr )

0 commit comments

Comments
 (0)