mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

volatile varibles in favor of std::atmoc<>

Browse Source
This commit is contained in:
Jinhao 2018-08-11 00:46:07 +08:00
parent 04e57771a4
commit a5f0d013c5
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nana/audio/detail/buffer_preparation.hpp
View File

@ -23,6 +23,8 @@
#include <windows.h>
#endif
#include <atomic>
namespace nana{ namespace audio
{
namespace detail
@ -52,8 +54,8 @@ namespace nana{ namespace audio
private:
void _m_prepare_routine();
private:
volatile bool running_;
volatile bool wait_for_buffer_;
std::atomic<bool> running_;
std::atomic<bool> wait_for_buffer_;
std::thread thr_;
mutable std::mutex token_buffer_, token_prepared_;
mutable std::condition_variable cond_buffer_, cond_prepared_;

2
include/nana/pat/cloneable.hpp
View File

@ -193,7 +193,7 @@ namespace nana{ namespace pat{
cwrapper_.reset();
}
operator operator_bool_t() const volatile noexcept
operator operator_bool_t() const noexcept
{
return (fast_ptr_ ? &inner_bool::true_stand : nullptr);
}

10
include/nana/system/timepiece.hpp
View File

@ -1,6 +1,6 @@
/*
* Timepiece Implementation
* Copyright(C) 2003-2013 Jinhao(cnjinhao@hotmail.com)
* Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@ -21,11 +21,11 @@ namespace system
{
public:
timepiece();
timepiece(const volatile timepiece&);
timepiece(const timepiece&);
~timepiece();
timepiece & operator=(const volatile timepiece &);
void start() volatile; ///< Set the begin time.
double calc() const volatile; ///< Get the intervals from the begin time.
timepiece & operator=(const timepiece &);
void start() noexcept; ///< Set the begin time.
double calc() const noexcept; ///< Get the intervals from the begin time.
private:
struct impl_t;
impl_t * impl_;

3
source/detail/posix/msg_dispatcher.hpp
View File

@ -26,6 +26,7 @@
#include <condition_variable>
#include <memory>
#include <thread>
#include <atomic>
namespace nana
{
@ -340,7 +341,7 @@ namespace detail
private:
Display * display_;
volatile bool is_work_{ false };
std::atomic<bool> is_work_{ false };
std::unique_ptr<std::thread> thrd_;
struct table_tag

3
source/detail/posix/platform_spec.hpp
View File

@ -20,6 +20,7 @@
#include <nana/push_ignore_diagnostic>
#include <atomic>
#include <thread>
#include <mutex>
#include <memory>
@ -268,7 +269,7 @@ namespace detail
std::recursive_mutex xlib_locker_;
struct caret_holder_tag
{
volatile bool exit_thread;
std::atomic<bool> exit_thread;
std::unique_ptr<std::thread> thr;
std::map<native_window_type, caret_rep*> carets;
}caret_holder_;

8
source/system/timepiece.cpp
View File

@ -24,7 +24,7 @@ namespace system
: impl_(new impl_t)
{}
timepiece::timepiece(const volatile timepiece& rhs)
timepiece::timepiece(const timepiece& rhs)
: impl_(new impl_t(*rhs.impl_))
{}
@ -33,7 +33,7 @@ namespace system
delete impl_;
}
timepiece & timepiece::operator=(const volatile timepiece & rhs)
timepiece & timepiece::operator=(const timepiece & rhs)
{
if(this != &rhs)
*impl_ = *rhs.impl_;
@ -41,7 +41,7 @@ namespace system
return *this;
}
void timepiece::start() volatile
void timepiece::start() noexcept
{
#if defined(NANA_WINDOWS)
::QueryPerformanceCounter(&impl_->beg_timestamp);
@ -51,7 +51,7 @@ namespace system
#endif
}
double timepiece::calc() const volatile
double timepiece::calc() const noexcept
{
#if defined(NANA_WINDOWS)
LARGE_INTEGER li;