Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / base / Debug.h

diff --git a/zypp/base/Debug.h b/zypp/base/Debug.h
index 6d1545c..e19d94f 100644 (file)
--- a/zypp/base/Debug.h
+++ b/zypp/base/Debug.h
@@ -10,7 +10,6 @@
  *
  * Debuging tools which should not be used in released code.
 */
-#ifndef ZYPP_NDEBUG
 #warning ZYPP_BASE_DEBUG_H included
 #ifndef ZYPP_BASE_DEBUG_H
 #define ZYPP_BASE_DEBUG_H
@@ -66,7 +65,7 @@ namespace zypp
     */
     struct TraceCADBase
     {
-      enum What { CTOR, COPYCTOR, MOVECTOR, ASSIGN, MOVEASSIGN, DTOR, PING };
+      enum What { CTOR, COPYCTOR, ASSIGN, DTOR, PING };
       std::string _ident;
     };
 
@@ -75,13 +74,11 @@ namespace zypp
     {
       switch( obj )
         {
-        case TraceCADBase::CTOR:       return str << "CTOR";
-        case TraceCADBase::COPYCTOR:   return str << "COPYCTOR";
-        case TraceCADBase::MOVECTOR:   return str << "MOVECTOR";
-        case TraceCADBase::ASSIGN:     return str << "ASSIGN";
-        case TraceCADBase::MOVEASSIGN: return str << "MOVEASSIGN";
-        case TraceCADBase::DTOR:       return str << "DTOR";
-        case TraceCADBase::PING:       return str << "PING";
+        case TraceCADBase::CTOR:     return str << "CTOR";
+        case TraceCADBase::COPYCTOR: return str << "COPYCTOR";
+        case TraceCADBase::ASSIGN:   return str << "ASSIGN";
+        case TraceCADBase::DTOR:     return str << "DTOR";
+        case TraceCADBase::PING:     return str << "PING";
         }
       return str;
     }
@@ -124,16 +121,9 @@ namespace zypp
         { ++_totalTraceCAD();
           traceCAD( COPYCTOR, *this, rhs ); }
 
-        TraceCAD( TraceCAD && rhs )
-        { ++_totalTraceCAD();
-         traceCAD( MOVECTOR, *this, rhs ); }
-
         TraceCAD & operator=( const TraceCAD & rhs )
         { traceCAD( ASSIGN, *this, rhs ); return *this; }
 
-        TraceCAD & operator=( TraceCAD && rhs )
-        { traceCAD( MOVEASSIGN, *this, rhs ); return *this; }
-
         virtual ~TraceCAD()
         { --_totalTraceCAD();
           traceCAD( DTOR, *this, *this ); }
@@ -165,9 +155,7 @@ namespace zypp
             break;
 
           case TraceCADBase::COPYCTOR:
-          case TraceCADBase::MOVECTOR:
           case TraceCADBase::ASSIGN:
-          case TraceCADBase::MOVEASSIGN:
             _DBG("DEBUG") << what_r << self_r << "( " << rhs_r << ")" << " (" << self_r._ident << ")" << std::endl;
             break;
           }
@@ -182,4 +170,3 @@ namespace zypp
 } // namespace zypp
 ///////////////////////////////////////////////////////////////////
 #endif // ZYPP_BASE_DEBUG_H
-#endif // ZYPP_NDEBUG