Fix NULL ptr compatibility issue.

diff --git a/cpp-sp-resolver.sln b/cpp-sp-resolver.sln
index 2ad7344..9aae251 100644 (file)
--- a/cpp-sp-resolver.sln
+++ b/cpp-sp-resolver.sln
@@ -7,7 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shibresolver-lite", "shibre
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3408DF00-FE03-41B1-AB95-9C45FF22DD44}"\r
        ProjectSection(SolutionItems) = preProject\r
-               bootstrap = bootstrap\r
                config_win32.h = config_win32.h\r
                configure.ac = configure.ac\r
                Makefile.am = Makefile.am\r

diff --git a/shibresolver/resolver-lite.vcxproj b/shibresolver/resolver-lite.vcxproj
index ca2b2f0..9fef091 100644 (file)
--- a/shibresolver/resolver-lite.vcxproj
+++ b/shibresolver/resolver-lite.vcxproj
@@ -93,10 +93,10 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_0</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_0D</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_0</TargetName>\r
-    <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>\r
-    <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>\r
-    <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>\r
-    <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>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r

diff --git a/shibresolver/resolver.cpp b/shibresolver/resolver.cpp
index a328f1d..8d90e64 100644 (file)
--- 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 (file)
--- a/shibresolver/resolver.vcxproj
+++ b/shibresolver/resolver.vcxproj
@@ -93,10 +93,10 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_0</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_0D</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_0</TargetName>\r
-    <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>\r
-    <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>\r
-    <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>\r
-    <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>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>\r
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath)</IncludePath>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r