From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 26 Jan 2011 00:47:32 +0000 (+0000)
Subject: Fix NULL ptr compatibility issue.
X-Git-Tag: 1.0.0~30
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp-resolver.git;a=commitdiff_plain;h=a9678f138fa51d06a3db7e147829afaab4bb7d74

Fix NULL ptr compatibility issue.
---

diff --git a/cpp-sp-resolver.sln b/cpp-sp-resolver.sln
index 2ad7344..9aae251 100644
--- a/cpp-sp-resolver.sln
+++ b/cpp-sp-resolver.sln
@@ -7,7 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shibresolver-lite", "shibre
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3408DF00-FE03-41B1-AB95-9C45FF22DD44}"
 	ProjectSection(SolutionItems) = preProject
-		bootstrap = bootstrap
 		config_win32.h = config_win32.h
 		configure.ac = configure.ac
 		Makefile.am = Makefile.am
diff --git a/shibresolver/resolver-lite.vcxproj b/shibresolver/resolver-lite.vcxproj
index ca2b2f0..9fef091 100644
--- a/shibresolver/resolver-lite.vcxproj
+++ b/shibresolver/resolver-lite.vcxproj
@@ -93,10 +93,10 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_0</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_0D</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_0</TargetName>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.;..;C:\cvs\2.0\cpp-xmltooling;C:\cvs\2.0\cpp-opensaml2;C:\cvs\2.0\cpp-sp;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.;..;C:\cvs\2.0\cpp-xmltooling;C:\cvs\2.0\cpp-opensaml2;C:\cvs\2.0\cpp-sp;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.;..;C:\cvs\2.0\cpp-xmltooling;C:\cvs\2.0\cpp-opensaml2;C:\cvs\2.0\cpp-sp;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.;..;C:\cvs\2.0\cpp-xmltooling;C:\cvs\2.0\cpp-opensaml2;C:\cvs\2.0\cpp-sp;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/shibresolver/resolver.cpp b/shibresolver/resolver.cpp
index a328f1d..8d90e64 100644
--- a/shibresolver/resolver.cpp
+++ b/shibresolver/resolver.cpp
@@ -278,7 +278,7 @@ void RemotedResolver::resolve(
 {
 #ifndef SHIBSP_LITE
     Category& log = Category::getInstance(SHIBRESOLVER_LOGCAT);
-    pair<const EntityDescriptor*,const RoleDescriptor*> entity = pair<const EntityDescriptor*,const RoleDescriptor*>(NULL,NULL);
+    pair<const EntityDescriptor*,const RoleDescriptor*> entity = make_pair((EntityDescriptor*)NULL, (RoleDescriptor*)NULL);
     MetadataProvider* m = app.getMetadataProvider();
     Locker locker(m);
     if (issuer && *issuer) {
diff --git a/shibresolver/resolver.vcxproj b/shibresolver/resolver.vcxproj
index 93fdede..2b5e7b7 100644
--- a/shibresolver/resolver.vcxproj
+++ b/shibresolver/resolver.vcxproj
@@ -93,10 +93,10 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_0</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_0D</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_0</TargetName>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.;..;C:\cvs\2.0\cpp-xmltooling;C:\cvs\2.0\cpp-opensaml2;C:\cvs\2.0\cpp-sp;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.;..;C:\cvs\2.0\cpp-xmltooling;C:\cvs\2.0\cpp-opensaml2;C:\cvs\2.0\cpp-sp;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.;..;C:\cvs\2.0\cpp-xmltooling;C:\cvs\2.0\cpp-opensaml2;C:\cvs\2.0\cpp-sp;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.;..;C:\cvs\2.0\cpp-xmltooling;C:\cvs\2.0\cpp-opensaml2;C:\cvs\2.0\cpp-sp;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>