Skip to content

Commit 177d94a

Browse files
committed
Fixed windows build errors
1 parent 195a32a commit 177d94a

File tree

4 files changed

+14
-54
lines changed

4 files changed

+14
-54
lines changed

Release/src/http/common/http_helpers.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include "stdafx.h"
2929
#include "cpprest/http_helpers.h"
30+
#include <array>
3031

3132
using namespace web;
3233
using namespace utility;

Release/src/json/json_parsing.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "stdafx.h"
2929
#include <vector>
3030
#include <cstdlib>
31+
#include <array>
3132

3233
#if defined(_MSC_VER)
3334
#pragma warning(disable : 4127) // allow expressions like while(true) pass

Release/src/utilities/base64.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
****/
2525

2626
#include "stdafx.h"
27+
#include <array>
2728

2829
using namespace web;
2930
using namespace utility;

casablanca120.desktop.sln

Lines changed: 11 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30128.0
4+
VisualStudioVersion = 12.0.30501.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca120.xp", "Release\src\build\casablanca120.xp.vcxproj", "{15F3B200-1AED-4B57-AF37-B21CD67914B1}"
77
EndProject
@@ -50,60 +50,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SearchFile120", "Release\sa
5050
{1014C621-BC2D-4813-B8C1-6D83AD6F9249} = {1014C621-BC2D-4813-B8C1-6D83AD6F9249}
5151
EndProjectSection
5252
EndProject
53+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codeplex165", "..\codeplex165\codeplex165.vcxproj", "{70E24896-422E-4CB4-B671-94D33D60BA1A}"
54+
EndProject
5355
Global
54-
GlobalSection(TeamFoundationVersionControl) = preSolution
55-
SccNumberOfProjects = 8
56-
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
57-
SccTeamFoundationServer = http://vstfdevdiv:8080/devdiv2
58-
SccProjectUniqueName0 = Release\\src\\build\\casablanca120.xp.vcxproj
59-
SccProjectTopLevelParentUniqueName0 = casablanca120.desktop.sln
60-
SccProjectName0 = Release/src/build
61-
SccAuxPath0 = http://vstfdevdiv:8080/devdiv2
62-
SccLocalPath0 = Release\\src\\build
63-
SccProvider0 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
64-
SccProjectUniqueName1 = Release\\samples\\BingRequest\\BingRequest120.xp\\BingRequest120.xp.vcxproj
65-
SccProjectTopLevelParentUniqueName1 = casablanca120.desktop.sln
66-
SccProjectName1 = Release/samples/BingRequest/BingRequest120.xp
67-
SccAuxPath1 = http://vstfdevdiv:8080/devdiv2
68-
SccLocalPath1 = Release\\samples\\BingRequest\\BingRequest120.xp
69-
SccProvider1 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
70-
SccProjectUniqueName2 = Release\\src\\build\\casablanca120.vcxproj
71-
SccProjectTopLevelParentUniqueName2 = casablanca120.desktop.sln
72-
SccProjectName2 = Release/src/build
73-
SccAuxPath2 = http://vstfdevdiv:8080/devdiv2
74-
SccLocalPath2 = Release\\src\\build
75-
SccProvider2 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
76-
SccProjectUniqueName3 = Release\\samples\\BingRequest\\BingRequest120\\BingRequest120.vcxproj
77-
SccProjectTopLevelParentUniqueName3 = casablanca120.desktop.sln
78-
SccProjectName3 = Release/samples/BingRequest/BingRequest120
79-
SccAuxPath3 = http://vstfdevdiv:8080/devdiv2
80-
SccLocalPath3 = Release\\samples\\BingRequest\\BingRequest120
81-
SccProvider3 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
82-
SccProjectUniqueName4 = Release\\samples\\BlackJack\\BlackJack_Client\\BlackJack_Client120\\BlackJack_Client120.vcxproj
83-
SccProjectTopLevelParentUniqueName4 = casablanca120.desktop.sln
84-
SccProjectName4 = Release/samples/BlackJack/BlackJack_Client/BlackJack_Client120
85-
SccAuxPath4 = http://vstfdevdiv:8080/devdiv2
86-
SccLocalPath4 = Release\\samples\\BlackJack\\BlackJack_Client\\BlackJack_Client120
87-
SccProvider4 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
88-
SccProjectUniqueName5 = Release\\samples\\BlackJack\\BlackJack_Server\\BlackJack_Server120\\BlackJack_Server120.vcxproj
89-
SccProjectTopLevelParentUniqueName5 = casablanca120.desktop.sln
90-
SccProjectName5 = Release/samples/BlackJack/BlackJack_Server/BlackJack_Server120
91-
SccAuxPath5 = http://vstfdevdiv:8080/devdiv2
92-
SccLocalPath5 = Release\\samples\\BlackJack\\BlackJack_Server\\BlackJack_Server120
93-
SccProvider5 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
94-
SccProjectUniqueName6 = Release\\samples\\CasaLens\\CasaLens120\\CasaLens120.vcxproj
95-
SccProjectTopLevelParentUniqueName6 = casablanca120.desktop.sln
96-
SccProjectName6 = Release/samples/CasaLens/CasaLens120
97-
SccAuxPath6 = http://vstfdevdiv:8080/devdiv2
98-
SccLocalPath6 = Release\\samples\\CasaLens\\CasaLens120
99-
SccProvider6 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
100-
SccProjectUniqueName7 = Release\\samples\\SearchFile\\SearchFile120\\SearchFile120.vcxproj
101-
SccProjectTopLevelParentUniqueName7 = casablanca120.desktop.sln
102-
SccProjectName7 = Release/samples/SearchFile/SearchFile120
103-
SccAuxPath7 = http://vstfdevdiv:8080/devdiv2
104-
SccLocalPath7 = Release\\samples\\SearchFile\\SearchFile120
105-
SccProvider7 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
106-
EndGlobalSection
10756
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10857
Debug|ARM = Debug|ARM
10958
Debug|Win32 = Debug|Win32
@@ -205,6 +154,14 @@ Global
205154
{F03BEE03-BEFB-4B17-A774-D9C8246530D4}.Release|Win32.Build.0 = Release|Win32
206155
{F03BEE03-BEFB-4B17-A774-D9C8246530D4}.Release|x64.ActiveCfg = Release|x64
207156
{F03BEE03-BEFB-4B17-A774-D9C8246530D4}.Release|x64.Build.0 = Release|x64
157+
{70E24896-422E-4CB4-B671-94D33D60BA1A}.Debug|ARM.ActiveCfg = Debug|Win32
158+
{70E24896-422E-4CB4-B671-94D33D60BA1A}.Debug|Win32.ActiveCfg = Debug|Win32
159+
{70E24896-422E-4CB4-B671-94D33D60BA1A}.Debug|Win32.Build.0 = Debug|Win32
160+
{70E24896-422E-4CB4-B671-94D33D60BA1A}.Debug|x64.ActiveCfg = Debug|Win32
161+
{70E24896-422E-4CB4-B671-94D33D60BA1A}.Release|ARM.ActiveCfg = Release|Win32
162+
{70E24896-422E-4CB4-B671-94D33D60BA1A}.Release|Win32.ActiveCfg = Release|Win32
163+
{70E24896-422E-4CB4-B671-94D33D60BA1A}.Release|Win32.Build.0 = Release|Win32
164+
{70E24896-422E-4CB4-B671-94D33D60BA1A}.Release|x64.ActiveCfg = Release|Win32
208165
EndGlobalSection
209166
GlobalSection(SolutionProperties) = preSolution
210167
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)