[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-209-g2020cee

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2020cee1a8030aa2cc762216fc41f79a58e9ed20 (commit)
       via  8174e5cd9424a7f45174562f21eb80eb06a3f3d0 (commit)
      from  553626cab6cb2a9173422359f2e1e62d1912c6b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2020cee1a8030aa2cc762216fc41f79a58e9ed20
commit 2020cee1a8030aa2cc762216fc41f79a58e9ed20
Merge: 553626c 8174e5c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 05:35:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 7 05:35:03 2015 -0400

    Merge topic 'data-layout' into next
    
    8174e5cd cmCustomCommand: Remove special member functions.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8174e5cd9424a7f45174562f21eb80eb06a3f3d0
commit 8174e5cd9424a7f45174562f21eb80eb06a3f3d0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 11:09:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 7 11:09:32 2015 +0200

    cmCustomCommand: Remove special member functions.
    
    The compiler generated ones are fine.  The existing implementations
    here are incorrect as they omit some members.

diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx
index 7418413..7c37e3b 100644
--- a/Source/cmCustomCommand.cxx
+++ b/Source/cmCustomCommand.cxx
@@ -26,46 +26,6 @@ cmCustomCommand::cmCustomCommand()
 }
 
 //----------------------------------------------------------------------------
-cmCustomCommand::cmCustomCommand(const cmCustomCommand& r):
-  Outputs(r.Outputs),
-  Byproducts(r.Byproducts),
-  Depends(r.Depends),
-  CommandLines(r.CommandLines),
-  Backtrace(r.Backtrace),
-  Comment(r.Comment),
-  WorkingDirectory(r.WorkingDirectory),
-  HaveComment(r.HaveComment),
-  EscapeAllowMakeVars(r.EscapeAllowMakeVars),
-  EscapeOldStyle(r.EscapeOldStyle),
-  UsesTerminal(r.UsesTerminal)
-{
-}
-
-//----------------------------------------------------------------------------
-cmCustomCommand& cmCustomCommand::operator=(cmCustomCommand const& r)
-{
-  if(this == &r)
-    {
-    return *this;
-    }
-
-  this->Outputs = r.Outputs;
-  this->Byproducts= r.Byproducts;
-  this->Depends = r.Depends;
-  this->CommandLines = r.CommandLines;
-  this->HaveComment = r.HaveComment;
-  this->Comment = r.Comment;
-  this->WorkingDirectory = r.WorkingDirectory;
-  this->EscapeAllowMakeVars = r.EscapeAllowMakeVars;
-  this->EscapeOldStyle = r.EscapeOldStyle;
-  this->ImplicitDepends = r.ImplicitDepends;
-  this->Backtrace = r.Backtrace;
-  this->UsesTerminal = r.UsesTerminal;
-
-  return *this;
-}
-
-//----------------------------------------------------------------------------
 cmCustomCommand::cmCustomCommand(cmMakefile const* mf,
                                  const std::vector<std::string>& outputs,
                                  const std::vector<std::string>& byproducts,
@@ -91,11 +51,6 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf,
 }
 
 //----------------------------------------------------------------------------
-cmCustomCommand::~cmCustomCommand()
-{
-}
-
-//----------------------------------------------------------------------------
 const std::vector<std::string>& cmCustomCommand::GetOutputs() const
 {
   return this->Outputs;
diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h
index cc5501f..f9b38c3 100644
--- a/Source/cmCustomCommand.h
+++ b/Source/cmCustomCommand.h
@@ -26,8 +26,6 @@ class cmCustomCommand
 public:
   /** Default and copy constructors for STL containers.  */
   cmCustomCommand();
-  cmCustomCommand(const cmCustomCommand& r);
-  cmCustomCommand& operator=(cmCustomCommand const& r);
 
   /** Main constructor specifies all information for the command.  */
   cmCustomCommand(cmMakefile const* mf,
@@ -38,8 +36,6 @@ public:
                   const char* comment,
                   const char* workingDirectory);
 
-  ~cmCustomCommand();
-
   /** Get the output file produced by the command.  */
   const std::vector<std::string>& GetOutputs() const;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmCustomCommand.cxx |   45 --------------------------------------------
 Source/cmCustomCommand.h   |    4 ----
 2 files changed, 49 deletions(-)


hooks/post-receive
-- 
CMake