diff options
| author | Marcel Smit <msmit@remedy.nl> | 2015-02-17 14:08:11 +0100 |
|---|---|---|
| committer | Marcel Smit <msmit@remedy.nl> | 2015-02-17 14:08:11 +0100 |
| commit | d6f9e4d8d17e60fd217b9ca38b47159ff2e24fd3 (patch) | |
| tree | adb7bffc5249a316b93e921d81cd0ebb26c1873d | |
| parent | 7248a8d8ebcdf6472754ee5f42940bb07ed247b0 (diff) | |
| download | ATCD-d6f9e4d8d17e60fd217b9ca38b47159ff2e24fd3.tar.gz | |
Replaced the check on the value of _cplusplus with
ACE_HAS_CPP11.
* ACE/ace/OS_NS_unistd.h:
* ACE/ace/OS_NS_unistd.inl:
* ACE/ace/Time_Value.h:
* ACE/ace/Time_Value.inl:
| -rw-r--r-- | ACE/ace/OS_NS_unistd.h | 4 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_unistd.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/Time_Value.h | 8 | ||||
| -rw-r--r-- | ACE/ace/Time_Value.inl | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index f202611f638..fa9e213cd41 100644 --- a/ACE/ace/OS_NS_unistd.h +++ b/ACE/ace/OS_NS_unistd.h @@ -295,11 +295,11 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int sleep (const ACE_Time_Value &tv); -#if __cplusplus >= 201103L +#if ACE_HAS_CPP11 template< class Rep, class Period > ACE_NAMESPACE_INLINE_FUNCTION int sleep (const std::chrono::duration<Rep, Period>& duration); -#endif /* __cplusplus >= 201103L */ +#endif /* ACE_HAS_CPP11 */ // used by ARGV::string_to_argv extern ACE_Export diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 4089368e3cd..ee46509a38f 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -964,7 +964,7 @@ ACE_OS::sleep (const ACE_Time_Value &tv) #endif /* ACE_WIN32 */ } -#if __cplusplus >= 201103L +#if ACE_HAS_CPP11 template< class Rep, class Period > ACE_INLINE int ACE_OS::sleep (const std::chrono::duration<Rep, Period>& duration) @@ -972,7 +972,7 @@ ACE_OS::sleep (const std::chrono::duration<Rep, Period>& duration) ACE_OS_TRACE ("ACE_OS::sleep"); return ACE_OS::sleep (ACE_Time_Value (duration)); } -#endif /* __cplusplus >= 201103L */ +#endif /* ACE_HAS_CPP11 */ ACE_INLINE void ACE_OS::swab (const void *src, diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h index 6cf00c69d39..cabd34fcfe4 100644 --- a/ACE/ace/Time_Value.h +++ b/ACE/ace/Time_Value.h @@ -21,9 +21,9 @@ # include "ace/os_include/os_time.h" -#if __cplusplus >= 201103L +#if ACE_HAS_CPP11 #include <chrono> -#endif +#endif /* ACE_HAS_CPP11 */ // Define some helpful constants. // Not type-safe, and signed. For backward compatibility. @@ -82,11 +82,11 @@ public: /// Construct the ACE_Time_Value object from a timespec_t. explicit ACE_Time_Value (const timespec_t &t); -#if __cplusplus >= 201103L +#if ACE_HAS_CPP11 /// Construct the ACE_Time_Value object from a chrono duration. template< class Rep, class Period > explicit ACE_Time_Value (const std::chrono::duration<Rep, Period>& duration); -#endif /* __cplusplus => 201103L */ +#endif /* ACE_HAS_CPP11 */ /// Destructor virtual ~ACE_Time_Value (); diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index bdfb7183a90..660558e8763 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -96,7 +96,7 @@ ACE_Time_Value::ACE_Time_Value (void) this->set (0, 0); } -#if __cplusplus >= 201103L +#if ACE_HAS_CPP11 template< class Rep, class Period > ACE_INLINE ACE_Time_Value::ACE_Time_Value (const std::chrono::duration<Rep, Period>& duration) @@ -109,7 +109,7 @@ ACE_Time_Value::ACE_Time_Value (const std::chrono::duration<Rep, Period>& durati duration % std::chrono::seconds (1))}; this->set (s.count (), usec.count ()); } -#endif /* __cplusplus => 201103L */ +#endif /* ACE_HAS_CPP11 */ ACE_INLINE ACE_Time_Value::ACE_Time_Value (time_t sec, suseconds_t usec) |