From: Michael Andres <ma@suse.de>
Date: Tue, 24 Jul 2012 12:49:17 +0000 (+0200)
Subject: genclass: Impl is NonCopyable
X-Git-Tag: 11.7.0~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Flibzypp.git;a=commitdiff_plain;h=86b1bb72bbbd8fb23cd339dc955286565547c402

genclass: Impl is NonCopyable
---

diff --git a/devel/genclass.in b/devel/genclass.in
index 137cbca..600d61a 100644
--- a/devel/genclass.in
+++ b/devel/genclass.in
@@ -101,14 +101,13 @@ $(intro $CLASS_H)
 
 #include "zypp/base/PtrTypes.h"
 #include "zypp/base/SafeBool.h"
-#include "zypp/base/NonCopyable.h"
 
 $(nsopen)
 ${INDENT}///////////////////////////////////////////////////////////////////
 ${INDENT}/// \class ${CLASS}
 ${INDENT}/// \brief
 ${INDENT}///////////////////////////////////////////////////////////////////
-${INDENT}class ${CLASS} : protected base::SafeBool<${CLASS}>, private base::NonCopyable
+${INDENT}class ${CLASS} : protected base::SafeBool<${CLASS}>
 ${INDENT}{
 ${INDENT}  friend std::ostream & operator<<( std::ostream & str, const ${CLASS} & obj );
 ${INDENT}  friend std::ostream & dumpOn( std::ostream & str, const ${CLASS} & obj );
@@ -166,6 +165,7 @@ cat <<EOF
 $(intro $CLASS_CC)
 #include <iostream>
 //#include "zypp/base/LogTools.h"
+#include "zypp/base/NonCopyable.h"
 
 #include "${INCLUDE_H}"
 
@@ -177,7 +177,7 @@ ${INDENT}///////////////////////////////////////////////////////////////////
 ${INDENT}/// \class ${CLASS}::Impl
 ${INDENT}/// \brief ${CLASS} implementation.
 ${INDENT}///////////////////////////////////////////////////////////////////
-${INDENT}struct ${CLASS}::Impl
+${INDENT}class ${CLASS}::Impl : private base::NonCopyable
 ${INDENT}{
 ${INDENT}  friend std::ostream & operator<<( std::ostream & str, const Impl & obj );
 ${INDENT}  friend std::ostream & dumpOn( std::ostream & str, const Impl & obj );