[Cmake-commits] CMake branch, next, updated. v3.0.2-2068-g236ff08

[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  236ff08cb78fd3da9bc0a8bab6cfb2c7a43a79d3 (commit)
       via  b64941dee7f79af5c1a5c006e9171a8de3ad81ce (commit)
      from  012f70919b847b7644d724ec178e2b3052150901 (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=236ff08cb78fd3da9bc0a8bab6cfb2c7a43a79d3
commit 236ff08cb78fd3da9bc0a8bab6cfb2c7a43a79d3
Merge: 012f709 b64941d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 14 17:30:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 14 17:30:46 2014 -0400

    Merge topic 'remove-borland-build' into next
    
    b64941de Remove workaround for Borland.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b64941dee7f79af5c1a5c006e9171a8de3ad81ce
commit b64941dee7f79af5c1a5c006e9171a8de3ad81ce
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 6 15:20:24 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 14 23:26:10 2014 +0200

    Remove workaround for Borland.
    
    CMake 3.0 is the last release to require to be able to build with
    Borland.

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 7fc1464..09d02ea 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -33,18 +33,10 @@ cmGeneratorExpression::cmGeneratorExpression(
 cmsys::auto_ptr<cmCompiledGeneratorExpression>
 cmGeneratorExpression::Parse(std::string const& input)
 {
-#if !defined(__BORLANDC__)
   return cmsys::auto_ptr<cmCompiledGeneratorExpression>(
     new cmCompiledGeneratorExpression(
       this->Backtrace ? *this->Backtrace : cmListFileBacktrace(NULL),
       input));
-#else
-  cmListFileBacktrace emptyBacktrace(NULL);
-  return cmsys::auto_ptr<cmCompiledGeneratorExpression>(
-    new cmCompiledGeneratorExpression(
-      this->Backtrace ? *this->Backtrace : emptyBacktrace,
-      input));
-#endif
 }
 
 //----------------------------------------------------------------------------

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

Summary of changes:
 Source/cmGeneratorExpression.cxx |    8 --------
 1 file changed, 8 deletions(-)


hooks/post-receive
-- 
CMake