[Cmake-commits] CMake branch, next, updated. v2.8.1-1376-gbf445ae

[Brad King]

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  bf445ae6976b73de32d3bef2f1e22b5a8fb34567 (commit)
       via  f20d091a2c5b61eeedfd604530f4554518d80d3f (commit)
      from  ba03616b250dd1ce3c3d8d86cf3dd42ec5e525b0 (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=bf445ae6976b73de32d3bef2f1e22b5a8fb34567
commit bf445ae6976b73de32d3bef2f1e22b5a8fb34567
Merge: ba03616 f20d091
Author: Brad King <brad.king at kitware.com>
Date:   Thu Jun 10 15:25:54 2010 -0400

    Merge branch 'tru64-cmOStringStream-vtable' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f20d091a2c5b61eeedfd604530f4554518d80d3f
commit f20d091a2c5b61eeedfd604530f4554518d80d3f
Author: Brad King <brad.king at kitware.com>
Date:   Thu Jun 10 15:18:21 2010 -0400

    Tru64: Place cmOStringStream vtable uniquely (#10541)
    
    GCC places the vtable in the object implementing the first non-pure,
    non-inline virtual method.  Since the symbol is not weak on Tru64, make
    the location unique by putting the destructor in a single object file.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index dc73cec..dbbb558 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -111,6 +111,7 @@ ENDIF(CMAKE_USE_ELF_PARSER)
 # Sources for CMakeLib
 #
 SET(SRCS
+  cmStandardIncludes.cxx
   cmBootstrapCommands.cxx
   cmCacheManager.cxx
   cmCacheManager.h
diff --git a/Source/cmStandardIncludes.cxx b/Source/cmStandardIncludes.cxx
new file mode 100644
index 0000000..a4bdb2e
--- /dev/null
+++ b/Source/cmStandardIncludes.cxx
@@ -0,0 +1,16 @@
+/*============================================================================
+  CMake - Cross Platform Makefile Generator
+  Copyright 2000-2010 Kitware, Inc., Insight Software Consortium
+
+  Distributed under the OSI-approved BSD License (the "License");
+  see accompanying file Copyright.txt for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the License for more information.
+============================================================================*/
+#include "cmStandardIncludes.h"
+#if !defined(CMAKE_NO_ANSI_STRING_STREAM)
+cmOStringStream::cmOStringStream() {}
+cmOStringStream::~cmOStringStream() {}
+#endif
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 9b9cb3b..e8decbb 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -241,7 +241,8 @@ typedef cmsys::String cmStdString;
 class cmOStringStream: public std::ostringstream
 {
 public:
-  cmOStringStream() {}
+  cmOStringStream();
+  ~cmOStringStream();
 private:
   cmOStringStream(const cmOStringStream&);
   void operator=(const cmOStringStream&);
diff --git a/bootstrap b/bootstrap
index c018b3c..1687776 100755
--- a/bootstrap
+++ b/bootstrap
@@ -166,6 +166,7 @@ CMAKE_UNUSED_SOURCES="\
 "
 
 CMAKE_CXX_SOURCES="\
+  cmStandardIncludes \
   cmake  \
   cmakemain \
   cmakewizard  \

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

Summary of changes:
 Source/CMakeLists.txt                              |    1 +
 ...mDocumentVariables.h => cmStandardIncludes.cxx} |   15 +++++----------
 Source/cmStandardIncludes.h                        |    3 ++-
 bootstrap                                          |    1 +
 4 files changed, 9 insertions(+), 11 deletions(-)
 copy Source/{cmDocumentVariables.h => cmStandardIncludes.cxx} (70%)


hooks/post-receive
-- 
CMake