diff --git a/src/cas/generic/casChannelI.h b/src/cas/generic/casChannelI.h index e26eec8f9..eda94cea6 100644 --- a/src/cas/generic/casChannelI.h +++ b/src/cas/generic/casChannelI.h @@ -28,7 +28,7 @@ class casMonitor; class casAsyncIOI; class casChannelI : public tsDLNode < casChannelI >, - public chronIntIdRes < casChannelI >, public casEvent, + public chronIntIdRes < casChannelI >, public casEvent, private casChannelDestroyFromPV { public: casChannelI ( casCoreClient & clientIn, casChannel & chanIn, diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc index 5f1438b8c..26673f1ec 100644 --- a/src/cas/generic/casStrmClient.cc +++ b/src/cas/generic/casStrmClient.cc @@ -1700,7 +1700,7 @@ caStatus casStrmClient::channelDestroyEventNotify ( // casStrmClient::casChannelDestroyFromInterfaceNotify() // immediateUninstallNeeded is false when we must avoid -// taking the lock insituations where we would compromise +// taking the lock in situations where we would compromise // the lock hierarchy void casStrmClient::casChannelDestroyFromInterfaceNotify ( casChannelI & chan, bool immediateUninstallNeeded )