diff options
| author | msmit <msmit@remedy.nl> | 2011-12-15 13:26:56 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2011-12-15 13:26:56 +0000 |
| commit | b323c89f023fb8c4b080169d2f8a23a71d76b1a2 (patch) | |
| tree | 80f37ed90409fcefdb9cf1baf4d20540f78135c7 | |
| parent | 939a6272cae3a12aa54e97b999ca230b6916703a (diff) | |
| download | ATCD-b323c89f023fb8c4b080169d2f8a23a71d76b1a2.tar.gz | |
Thu Dec 15 13:25:37 UTC 2011 Marcel Smit <msmit@remedy.nl>
* tao/ORB_Time_Policy.h:
* tao/ORB_Time_Policy.inl:
Fixed warning for gcc 4.6.2
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/ORB_Time_Policy.h | 2 | ||||
| -rw-r--r-- | TAO/tao/ORB_Time_Policy.inl | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a9550b1acd5..70cb6ad8d6f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Dec 15 13:25:37 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tao/ORB_Time_Policy.h: + * tao/ORB_Time_Policy.inl: + Fixed warning for gcc 4.6.2 + Thu Dec 15 11:00:00 UTC 2011 Martin Corino <mcorino@remedy.nl> Merged timer_policy branch. diff --git a/TAO/tao/ORB_Time_Policy.h b/TAO/tao/ORB_Time_Policy.h index 8e60cee3506..f4ee57d8420 100644 --- a/TAO/tao/ORB_Time_Policy.h +++ b/TAO/tao/ORB_Time_Policy.h @@ -55,7 +55,7 @@ namespace TAO // Declare a countdown timer type based on ORB time policy typedef ACE_Countdown_Time_T<ORB_Time_Policy> ORB_Countdown_Time; -}; // TAO +} // TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Time_Policy.inl b/TAO/tao/ORB_Time_Policy.inl index 1a87174c021..38748f013c3 100644 --- a/TAO/tao/ORB_Time_Policy.inl +++ b/TAO/tao/ORB_Time_Policy.inl @@ -13,6 +13,6 @@ namespace TAO return (*active_policy_) (); } -}; +} TAO_END_VERSIONED_NAMESPACE_DECL |