Merged revisions 262,264-265,267-282,284-298,300-311 via svnmerge from

[senf.git] / Utils / SafeBool.cti

diff --git a/Utils/SafeBool.cti b/Utils/SafeBool.cti
index 603ae8a..a1d4bc0 100644 (file)
--- a/Utils/SafeBool.cti
+++ b/Utils/SafeBool.cti
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2006 
+// Copyright (C) 2006
 
 // Definition of inline template functions
 
@@ -12,32 +12,32 @@
 ///////////////////////////////cti.p///////////////////////////////////////
 
 template <typename T>
-prefix_ satcom::lib::SafeBool<T>::operator bool_type()
+prefix_ senf::ComparableSafeBool<T>::operator bool_type()
     const
 {
     return (static_cast<const T*>(this))->boolean_test()
-       ? &SafeBoolBase::this_type_does_not_support_comparisons : 0;
+        ? &SafeBoolBase::this_type_does_not_support_comparisons : 0;
 }
 
 template <typename T>
-prefix_ bool satcom::lib::SafeBool<T>::operator!()
+prefix_ bool senf::ComparableSafeBool<T>::operator!()
     const
 {
     return ! (static_cast<const T*>(this))->boolean_test();
 }
 
 template <typename T>
-prefix_ satcom::lib::SafeBool<T>::~SafeBool()
+prefix_ senf::ComparableSafeBool<T>::~ComparableSafeBool()
 {}
 
 template <typename T, typename U>
-prefix_ void satcom::lib::operator==(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
+prefix_ void senf::operator==(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
 {
-    lhs.this_type_does_not_support_comparisons();     
+    lhs.this_type_does_not_support_comparisons();
 }
 
 template <typename T, typename U>
-prefix_ void satcom::lib::operator!=(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
+prefix_ void senf::operator!=(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
 {
     lhs.this_type_does_not_support_comparisons();
 }
@@ -48,4 +48,10 @@ prefix_ void satcom::lib::operator!=(const SafeBool<T>& lhs, const SafeBool<U>&
 \f
 // Local Variables:
 // mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: