[cmake-commits] martink committed cmMakefile.cxx 1.367 1.368 cmTarget.cxx 1.112 1.113

[cmake-commits at cmake.org]

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

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


Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- cmTarget.cxx	29 Nov 2006 20:45:49 -0000	1.112
+++ cmTarget.cxx	29 Nov 2006 22:10:29 -0000	1.113
@@ -464,7 +464,7 @@
                               LinkLibraryType llt)
 {
   this->AddFramework(lib.c_str(), llt);
-  std::pair<std::string, cmTarget::LinkLibraryType> tmp;
+  cmTarget::LibraryID tmp;
   tmp.first = lib;
   tmp.second = llt;
   this->LinkLibraries.push_back(tmp);
@@ -499,7 +499,7 @@
     return;
     }
   this->AddFramework(lib, llt);
-  std::pair<std::string,  cmTarget::LinkLibraryType> tmp;
+  cmTarget::LibraryID tmp;
   tmp.first = lib;
   tmp.second = llt;
   this->LinkLibraries.push_back( tmp );

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- cmMakefile.cxx	29 Nov 2006 20:59:16 -0000	1.367
+++ cmMakefile.cxx	29 Nov 2006 22:10:29 -0000	1.368
@@ -894,7 +894,7 @@
 void cmMakefile::AddLinkLibrary(const char* lib, 
                                 cmTarget::LinkLibraryType llt)
 {
-  std::pair<std::string, cmTarget::LinkLibraryType> tmp;
+  cmTarget::LibraryID tmp;
   tmp.first = lib;
   tmp.second = llt;
   this->LinkLibraries.push_back(tmp);