summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-09-28 12:39:46 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-09-28 12:39:46 +0000
commite8ba053e33cfb121626124d5239ef798e435a494 (patch)
treee396c6bb0434fd9c2002e79dfdb429b40eeeebb1
parentac0ebc9d0f01495205ef0cb0fc5d17cd766b9e77 (diff)
downloadATCD-e8ba053e33cfb121626124d5239ef798e435a494.tar.gz
Wed Sep 28 12:39:12 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/AV/AVStreams_i.h: * orbsvcs/tests/Notify/lib/Peer_T.cpp: Layout changes and cleanup
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h3
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp2
3 files changed, 7 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 98b1705b468..bbbd0e5803c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 28 12:39:12 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * orbsvcs/orbsvcs/AV/AVStreams_i.h:
+ * orbsvcs/tests/Notify/lib/Peer_T.cpp:
+ Layout changes and cleanup
+
Wed Sep 28 12:37:05 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/Persistent_Grid/Grid_i.h:
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 35d77b38b22..fb77a839fab 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -313,8 +313,7 @@ public:
const char * format_name);
virtual void set_dev_params (const char * flowName,
- const CosPropertyService::Properties & new_params)
-;
+ const CosPropertyService::Properties & new_params);
protected:
/// checks whether the flowname is in the flow_spec.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 62a30ea9a2a..c93dd2a6af9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -155,8 +155,6 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
"Peer %s is_equivanent other exception.",
this->name_.c_str ()));
}
-#else
-;
#endif /* TAO_HAS_MINIMUM_CORBA */
}