diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Service_Config.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Service_Config.cpp')
| -rw-r--r-- | dep/acelite/ace/Service_Config.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dep/acelite/ace/Service_Config.cpp b/dep/acelite/ace/Service_Config.cpp index d63f46c1b86..9149e98e43d 100644 --- a/dep/acelite/ace/Service_Config.cpp +++ b/dep/acelite/ace/Service_Config.cpp @@ -1,4 +1,4 @@ -// $Id: Service_Config.cpp 91693 2010-09-09 12:57:54Z johnnyw $ +// $Id: Service_Config.cpp 96017 2012-08-08 22:18:09Z mitza $ #include "ace/Service_Config.h" @@ -601,7 +601,8 @@ void ACE_Service_Config::reconfig_occurred (int config_occurred) { ACE_TRACE ("ACE_Service_Config::reconfig_occurred"); - ACE_Service_Config::reconfig_occurred_ = config_occurred; + ACE_Service_Config::reconfig_occurred_ = + static_cast<sig_atomic_t> (config_occurred); } ACE_END_VERSIONED_NAMESPACE_DECL |