[cmake-commits] martink committed cmMakefile.cxx 1.365 1.366 cmTarget.cxx 1.111 1.112

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv31615

Modified Files:
	cmMakefile.cxx cmTarget.cxx 
Log Message:
COMP: fix compile issue on Sun


Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- cmTarget.cxx	29 Nov 2006 16:00:17 -0000	1.111
+++ cmTarget.cxx	29 Nov 2006 20:45:49 -0000	1.112
@@ -464,8 +464,10 @@
                               LinkLibraryType llt)
 {
   this->AddFramework(lib.c_str(), llt);
-  this->LinkLibraries.push_back( std::pair<std::string, 
-                                 cmTarget::LinkLibraryType>(lib,llt) );
+  std::pair<std::string, cmTarget::LinkLibraryType> tmp;
+  tmp.first = lib;
+  tmp.second = llt;
+  this->LinkLibraries.push_back(tmp);
 }
 
 bool cmTarget::AddFramework(const std::string& libname, LinkLibraryType llt)
@@ -497,8 +499,10 @@
     return;
     }
   this->AddFramework(lib, llt);
-  this->LinkLibraries.push_back( std::pair<std::string, 
-                                 cmTarget::LinkLibraryType>(lib,llt) );
+  std::pair<std::string,  cmTarget::LinkLibraryType> tmp;
+  tmp.first = lib;
+  tmp.second = llt;
+  this->LinkLibraries.push_back( tmp );
 
   // Add the explicit dependency information for this target. This is
   // simply a set of libraries separated by ";". There should always

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -d -r1.365 -r1.366
--- cmMakefile.cxx	29 Nov 2006 16:00:17 -0000	1.365
+++ cmMakefile.cxx	29 Nov 2006 20:45:49 -0000	1.366
@@ -911,8 +911,10 @@
 void cmMakefile::AddLinkLibrary(const char* lib, 
                                 cmTarget::LinkLibraryType llt)
 {
-  this->LinkLibraries.push_back(
-    std::pair<std::string, cmTarget::LinkLibraryType>(lib,llt));
+  std::pair<std::string, cmTarget::LinkLibraryType> tmp;
+  tmp.first = lib;
+  tmp.second = llt;
+  this->LinkLibraries.push_back(tmp);
 }
 
 void cmMakefile::AddLinkLibraryForTarget(const char *target,