diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-02 08:46:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-02 08:46:58 +0100 |
commit | f7d406f7f569439397765bcd30582b3c3aa6998b (patch) | |
tree | 8db7da08b2d11b1b21561270cdb56973455be91a /ACE/ace/WFMO_Reactor.cpp | |
parent | a3ae5a65d046393d55be622e08716ed6a44ade9e (diff) | |
parent | 24844e3c32a35117c36edf541035ea14aa2bac7b (diff) | |
download | ATCD-f7d406f7f569439397765bcd30582b3c3aa6998b.tar.gz |
Merge pull request #1308 from jwillemsen/jwi-msvccleanup
Cleanup Visual Studio support now that we only support Visual Studio …
Diffstat (limited to 'ACE/ace/WFMO_Reactor.cpp')
-rw-r--r-- | ACE/ace/WFMO_Reactor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index 9bd76af0c23..a835962f7ae 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1052,7 +1052,7 @@ ACE_WFMO_Reactor::work_pending (const ACE_Time_Value &) ACE_NOTSUP_RETURN (-1); } -#if defined (ACE_WIN32_VC8) +#if defined (_MSC_VER) # pragma warning (push) # pragma warning (disable:4355) /* Use of 'this' in initializer list */ # endif @@ -1121,7 +1121,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, ACE_TEXT ("%p\n"), ACE_TEXT ("WFMO_Reactor"))); } -#if defined (ACE_WIN32_VC8) +#if defined (_MSC_VER) # pragma warning (pop) #endif |