Merge topic 'compiler-features'

059a6ca0 Merge branch 'unknown-aliased-target' into compiler-features
1d6909a2 use CM_NULLPTR
b4b73f56 cxx features: add check for nullptr
a7a92390 mark functions with CM_OVERRIDE
9e2d6f0c CM_OVERRIDE: mark destructor overridden in the feature test.
2ca76a66 Validate target name in ALIASED_TARGET property getter

1 files changed, 19 insertions, 13 deletions

diff --git a/Source/cmTargetIncludeDirectoriesCommand.h b/Source/cmTargetIncludeDirectoriesCommand.h
index 4c907bd..ba5d980 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.h
+++ b/Source/cmTargetIncludeDirectoriesCommand.h
@@ -21,34 +21,40 @@ public:
   /**
    * This is a virtual constructor for the command.
    */
-  virtual cmCommand* Clone() { return new cmTargetIncludeDirectoriesCommand; }
+  cmCommand* Clone() CM_OVERRIDE
+  {
+    return new cmTargetIncludeDirectoriesCommand;
+  }
 
   /**
    * This is called when the command is first encountered in
    * the CMakeLists.txt file.
    */
-  virtual bool InitialPass(std::vector<std::string> const& args,
-                           cmExecutionStatus& status);
+  bool InitialPass(std::vector<std::string> const& args,
+                   cmExecutionStatus& status) CM_OVERRIDE;
 
   /**
    * The name of the command as specified in CMakeList.txt.
    */
-  virtual std::string GetName() const { return "target_include_directories"; }
+  std::string GetName() const CM_OVERRIDE
+  {
+    return "target_include_directories";
+  }
 
   cmTypeMacro(cmTargetIncludeDirectoriesCommand, cmTargetPropCommandBase);
 
 private:
-  virtual void HandleImportedTarget(const std::string& tgt);
-  virtual void HandleMissingTarget(const std::string& name);
+  void HandleImportedTarget(const std::string& tgt) CM_OVERRIDE;
+  void HandleMissingTarget(const std::string& name) CM_OVERRIDE;
 
-  virtual bool HandleDirectContent(cmTarget* tgt,
-                                   const std::vector<std::string>& content,
-                                   bool prepend, bool system);
-  virtual void HandleInterfaceContent(cmTarget* tgt,
-                                      const std::vector<std::string>& content,
-                                      bool prepend, bool system);
+  bool HandleDirectContent(cmTarget* tgt,
+                           const std::vector<std::string>& content,
+                           bool prepend, bool system) CM_OVERRIDE;
+  void HandleInterfaceContent(cmTarget* tgt,
+                              const std::vector<std::string>& content,
+                              bool prepend, bool system) CM_OVERRIDE;
 
-  virtual std::string Join(const std::vector<std::string>& content);
+  std::string Join(const std::vector<std::string>& content) CM_OVERRIDE;
 };
 
 #endif