aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-10-02 22:25:43 -0400
committerJack Lloyd <[email protected]>2017-10-02 22:25:43 -0400
commita27a5a2adb10666624cd2ba1e5c046a006808835 (patch)
tree4b9bf296f2cd832633b8711543bab88a89eac4ae
parentb962d8c27be425cc2f24391ff83397fa04c9914a (diff)
Prefix names in global namespace with ::
-rw-r--r--src/lib/utils/calendar.cpp10
-rw-r--r--src/lib/utils/dyn_load/dyn_load.cpp2
-rw-r--r--src/lib/utils/os_utils.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/utils/calendar.cpp b/src/lib/utils/calendar.cpp
index ddd424e0e..a69be3431 100644
--- a/src/lib/utils/calendar.cpp
+++ b/src/lib/utils/calendar.cpp
@@ -27,9 +27,9 @@ std::tm do_gmtime(std::time_t time_val)
std::tm tm;
#if defined(BOTAN_TARGET_OS_HAS_GMTIME_S)
- gmtime_s(&tm, &time_val); // Windows
+ ::gmtime_s(&tm, &time_val); // Windows
#elif defined(BOTAN_TARGET_OS_HAS_GMTIME_R)
- gmtime_r(&time_val, &tm); // Unix/SUSv2
+ ::gmtime_r(&time_val, &tm); // Unix/SUSv2
#else
std::tm* tm_p = std::gmtime(&time_val);
if (tm_p == nullptr)
@@ -139,16 +139,16 @@ std::chrono::system_clock::time_point calendar_point::to_std_timepoint() const
// Define a function alias `botan_timegm`
#if defined(BOTAN_TARGET_OS_HAS_TIMEGM)
- std::time_t (&botan_timegm)(std::tm *tm) = timegm;
+ std::time_t (&botan_timegm)(std::tm *tm) = ::timegm;
#elif defined(BOTAN_TARGET_OS_HAS_MKGMTIME) && defined(BOTAN_BUILD_COMPILER_IS_MSVC)
// http://stackoverflow.com/questions/16647819/timegm-cross-platform
- std::time_t (&botan_timegm)(std::tm *tm) = _mkgmtime;
+ std::time_t (&botan_timegm)(std::tm *tm) = ::_mkgmtime;
#elif defined(BOTAN_HAS_BOOST_DATETIME)
std::time_t (&botan_timegm)(std::tm *tm) = boost_timegm;
#elif defined(BOTAN_OS_TYPE_IS_UNIX)
std::time_t (&botan_timegm)(std::tm *tm) = fallback_timegm;
#else
- std::time_t (&botan_timegm)(std::tm *tm) = mktime; // localtime instead...
+ std::time_t (&botan_timegm)(std::tm *tm) = ::mktime; // localtime instead...
#endif
// Convert std::tm to std::time_t
diff --git a/src/lib/utils/dyn_load/dyn_load.cpp b/src/lib/utils/dyn_load/dyn_load.cpp
index 2cacf7c46..33288b8d1 100644
--- a/src/lib/utils/dyn_load/dyn_load.cpp
+++ b/src/lib/utils/dyn_load/dyn_load.cpp
@@ -37,7 +37,7 @@ Dynamically_Loaded_Library::Dynamically_Loaded_Library(
m_lib = ::dlopen(m_lib_name.c_str(), RTLD_LAZY);
if(!m_lib)
- raise_runtime_loader_exception(m_lib_name, dlerror());
+ raise_runtime_loader_exception(m_lib_name, ::dlerror());
#elif defined(BOTAN_TARGET_OS_HAS_LOADLIBRARY)
m_lib = ::LoadLibraryA(m_lib_name.c_str());
diff --git a/src/lib/utils/os_utils.cpp b/src/lib/utils/os_utils.cpp
index 3f7d3cfde..02ce1322a 100644
--- a/src/lib/utils/os_utils.cpp
+++ b/src/lib/utils/os_utils.cpp
@@ -640,7 +640,7 @@ int OS::run_cpu_instruction_probe(std::function<int ()> probe_fn)
struct sigaction sigaction;
sigaction.sa_handler = botan_sigill_handler;
- sigemptyset(&sigaction.sa_mask);
+ ::sigemptyset(&sigaction.sa_mask);
sigaction.sa_flags = 0;
int rc = ::sigaction(SIGILL, &sigaction, &old_sigaction);