Ubuntu
ceph package

Merge ~lmlogiudice/ubuntu/+source/ceph:kinetic-fixes into ubuntu/+source/ceph:ubuntu/kinetic

  1. Git
  2. lp:~lmlogiudice/ubuntu/+source/ceph
  3. kinetic-fixes
  4. Merge into ubuntu/kinetic
Proposed by Luciano Lo Giudice
Status: Merged
Merge reported by: Robie Basak
Merged at revision: 8047db8891da3ff29c3f53f0e40730aec4437d39
Proposed branch: ~lmlogiudice/ubuntu/+source/ceph:kinetic-fixes
Merge into: ubuntu/+source/ceph:ubuntu/kinetic
Diff against target: 10434 lines (+9673/-0) (has conflicts)
64 files modified
debian/changelog (+17/-0)
debian/patches/fix-kinetic-libfmt.patch (+82/-0)
debian/patches/fix-kinetic-misc.patch (+43/-0)
debian/patches/lp1986747-fix-osd-class-dir.patch (+23/-0)
debian/patches/series (+9/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln (+35/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj (+194/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops (+18/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj (+190/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj (+204/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln (+35/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj (+85/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props (+22/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj (+91/-0)
src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj (+104/-0)
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj (+140/-0)
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj (+56/-0)
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc (+41/-0)
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc (+43/-0)
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj (+85/-0)
src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj (+90/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln (+48/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj (+129/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln (+48/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj (+129/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj (+132/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj (+132/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj (+167/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj (+167/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj (+150/-0)
src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj (+150/-0)
src/zstd/build/VS2008/fullbench/fullbench.vcproj (+552/-0)
src/zstd/build/VS2008/fuzzer/fuzzer.vcproj (+588/-0)
src/zstd/build/VS2008/zstd.sln (+59/-0)
src/zstd/build/VS2008/zstd/zstd.vcproj (+668/-0)
src/zstd/build/VS2008/zstdlib/zstdlib.vcproj (+638/-0)
src/zstd/build/VS2010/datagen/datagen.vcxproj (+171/-0)
src/zstd/build/VS2010/fullbench-dll/fullbench-dll.vcxproj (+192/-0)
src/zstd/build/VS2010/fullbench/fullbench.vcxproj (+221/-0)
src/zstd/build/VS2010/fuzzer/fuzzer.vcxproj (+226/-0)
src/zstd/build/VS2010/libzstd-dll/libzstd-dll.rc (+54/-0)
src/zstd/build/VS2010/libzstd-dll/libzstd-dll.vcxproj (+257/-0)
src/zstd/build/VS2010/libzstd/libzstd.vcxproj (+250/-0)
src/zstd/build/VS2010/zstd.sln (+92/-0)
src/zstd/build/VS2010/zstd/zstd.rc (+54/-0)
src/zstd/build/VS2010/zstd/zstd.vcxproj (+260/-0)
src/zstd/build/VS_scripts/build.VS2010.cmd (+9/-0)
src/zstd/build/VS_scripts/build.VS2012.cmd (+8/-0)
src/zstd/build/VS_scripts/build.VS2013.cmd (+9/-0)
src/zstd/build/VS_scripts/build.VS2015.cmd (+9/-0)
src/zstd/build/VS_scripts/build.VS2017.cmd (+9/-0)
src/zstd/build/VS_scripts/build.VS2017Community.cmd (+9/-0)
src/zstd/build/VS_scripts/build.VS2017Enterprise.cmd (+9/-0)
src/zstd/build/VS_scripts/build.VS2017Professional.cmd (+9/-0)
src/zstd/build/VS_scripts/build.generic.cmd (+65/-0)
src/zstd/contrib/VS2005/fullbench/fullbench.vcproj (+443/-0)
src/zstd/contrib/VS2005/fuzzer/fuzzer.vcproj (+491/-0)
src/zstd/contrib/VS2005/zstd.sln (+58/-0)
src/zstd/contrib/VS2005/zstd/zstd.vcproj (+551/-0)
src/zstd/contrib/VS2005/zstdlib/zstdlib.vcproj (+565/-0)
src/zstd/lib/dll/example/build_package.bat (+23/-0)
src/zstd/lib/dll/example/fullbench-dll.sln (+28/-0)
src/zstd/lib/dll/example/fullbench-dll.vcxproj (+183/-0)
src/zstd/programs/windres/zstd.rc (+54/-0)
Conflict in debian/changelog
Conflict in debian/patches/series
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj
Conflict in src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc
Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc
Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj
Conflict in src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj
Conflict in src/zstd/build/VS2008/fullbench/fullbench.vcproj
Conflict in src/zstd/build/VS2008/fuzzer/fuzzer.vcproj
Conflict in src/zstd/build/VS2008/zstd.sln
Conflict in src/zstd/build/VS2008/zstd/zstd.vcproj
Conflict in src/zstd/build/VS2008/zstdlib/zstdlib.vcproj
Conflict in src/zstd/build/VS2010/datagen/datagen.vcxproj
Conflict in src/zstd/build/VS2010/fullbench-dll/fullbench-dll.vcxproj
Conflict in src/zstd/build/VS2010/fullbench/fullbench.vcxproj
Conflict in src/zstd/build/VS2010/fuzzer/fuzzer.vcxproj
Conflict in src/zstd/build/VS2010/libzstd-dll/libzstd-dll.rc
Conflict in src/zstd/build/VS2010/libzstd-dll/libzstd-dll.vcxproj
Conflict in src/zstd/build/VS2010/libzstd/libzstd.vcxproj
Conflict in src/zstd/build/VS2010/zstd.sln
Conflict in src/zstd/build/VS2010/zstd/zstd.rc
Conflict in src/zstd/build/VS2010/zstd/zstd.vcxproj
Conflict in src/zstd/build/VS_scripts/build.VS2010.cmd
Conflict in src/zstd/build/VS_scripts/build.VS2012.cmd
Conflict in src/zstd/build/VS_scripts/build.VS2013.cmd
Conflict in src/zstd/build/VS_scripts/build.VS2015.cmd
Conflict in src/zstd/build/VS_scripts/build.VS2017.cmd
Conflict in src/zstd/build/VS_scripts/build.VS2017Community.cmd
Conflict in src/zstd/build/VS_scripts/build.VS2017Enterprise.cmd
Conflict in src/zstd/build/VS_scripts/build.VS2017Professional.cmd
Conflict in src/zstd/build/VS_scripts/build.generic.cmd
Conflict in src/zstd/contrib/VS2005/fullbench/fullbench.vcproj
Conflict in src/zstd/contrib/VS2005/fuzzer/fuzzer.vcproj
Conflict in src/zstd/contrib/VS2005/zstd.sln
Conflict in src/zstd/contrib/VS2005/zstd/zstd.vcproj
Conflict in src/zstd/contrib/VS2005/zstdlib/zstdlib.vcproj
Conflict in src/zstd/lib/dll/example/build_package.bat
Conflict in src/zstd/lib/dll/example/fullbench-dll.sln
Conflict in src/zstd/lib/dll/example/fullbench-dll.vcxproj
Conflict in src/zstd/programs/windres/zstd.rc
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
git-ubuntu import Pending
Review via email: mp+430118@code.launchpad.net

Commit message

Various fixes to make Ceph build on Ubuntu Kinetic

To post a comment you must log in.
~lmlogiudice/ubuntu/+source/ceph:kinetic-fixes updated
8047db8... by Luciano Lo Giudice

Fixes Ceph build on Ubuntu Kinetic

* d/p/fix-kinetic-libfmt.patch: Apply fixes for libfmt > 8
* d/p/fix-kinetic-misc.patch: Misc. fixes for Ubuntu Kinetic

Revision history for this message
Sebastien Bacher (seb128) wrote :

The work there seems to have landed in kinetic with a newer revision, the merge request should be closed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index f4e104b..a586306 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,20 @@
6+<<<<<<< debian/changelog
7+=======
8+ceph (17.2.0-0ubuntu3) kinetic; urgency=medium
9+
10+ * d/p/fix-kinetic-libfmt.patch: Apply fixes for libfmt > 8
11+ * d/p/fix-kinetic-misc.patch: Misc. fixes for Ubuntu Kinetic
12+
13+ -- Luciano Lo Giudice <luciano.logiudice@canonical.com> Wed, 21 Sep 2022 18:44:43 -0300
14+
15+ceph (17.2.0-0ubuntu2) kinetic; urgency=medium
16+
17+ * d/p/lp1986747-fix-osd-class-dir.patch: Fix rados-classes
18+ search path (LP: #1986747).
19+
20+ -- Chris MacNaughton <chris.macnaughton@ubuntu.com> Thu, 01 Sep 2022 16:33:54 +0100
21+
22+>>>>>>> debian/changelog
23 ceph (17.2.0-0ubuntu1) kinetic; urgency=medium
24
25 * New upstream release for Ceph Quincy (LP: #1968318):
26diff --git a/debian/patches/fix-kinetic-libfmt.patch b/debian/patches/fix-kinetic-libfmt.patch
27new file mode 100644
28index 0000000..c84dc65
29--- /dev/null
30+++ b/debian/patches/fix-kinetic-libfmt.patch
31@@ -0,0 +1,82 @@
32+Description: Build fixes for libfmt > 8
33+Author: Luciano Lo Giudice <luciano.logiudice@canonical.com>
34+Forwarded: No
35+
36+---
37+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
38+index 30cf360546..eb37a459ab 100644
39+--- a/src/CMakeLists.txt
40++++ b/src/CMakeLists.txt
41+@@ -78,6 +78,7 @@ add_definitions(
42+ -D_THREAD_SAFE
43+ -D__STDC_FORMAT_MACROS
44+ -D_FILE_OFFSET_BITS=64
45++ -DFMT_DEPRECATED_OSTREAM
46+ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION)
47+ if(Boost_VERSION VERSION_GREATER_EQUAL 1.74)
48+ add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT)
49+diff --git a/src/crimson/admin/osd_admin.cc b/src/crimson/admin/osd_admin.cc
50+index e832045883..59c8696bd0 100644
51+--- a/src/crimson/admin/osd_admin.cc
52++++ b/src/crimson/admin/osd_admin.cc
53+@@ -299,7 +299,7 @@ static ghobject_t test_ops_get_object_name(
54+ // the return type of `fmt::format` is `std::string`
55+ using namespace fmt::literals;
56+ throw std::invalid_argument{
57+- "Invalid pool '{}'"_format(*pool_arg)
58++ fmt::format("Invalid pool '{}'", *pool_arg)
59+ };
60+ }
61+ return pool;
62+diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h
63+index 379583523d..10cdeab1ad 100644
64+--- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h
65++++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h
66+@@ -206,7 +206,7 @@ class DeltaRecorderT final: public DeltaRecorder {
67+ default:
68+ SUBERROR(seastore_onode,
69+ "got unknown op {} when replay {}",
70+- op, node);
71++ static_cast<int>(op), node);
72+ ceph_abort("fatal error");
73+ }
74+ } catch (buffer::error& e) {
75+diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
76+index eb166b1ad3..408211a744 100644
77+--- a/src/crimson/os/seastore/seastore.cc
78++++ b/src/crimson/os/seastore/seastore.cc
79+@@ -124,7 +124,7 @@ void SeaStore::register_metrics()
80+
81+ for (auto& [op_type, label] : labels_by_op_type) {
82+ auto desc = fmt::format("latency of seastore operation (optype={})",
83+- op_type);
84++ static_cast<int>(op_type));
85+ metrics.add_group(
86+ "seastore",
87+ {
88+diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
89+index 9103ddf7c5..c196e8429f 100644
90+--- a/src/mon/LogMonitor.cc
91++++ b/src/mon/LogMonitor.cc
92+@@ -411,7 +411,7 @@ void LogMonitor::log_external(const LogEntry& le)
93+ }
94+
95+ if (fd >= 0) {
96+- fmt::format_to(file_log_buffer, "{}\n", le);
97++ fmt::format_to(std::back_inserter(file_log_buffer), "{}\n", le);
98+ int err = safe_write(fd, file_log_buffer.data(), file_log_buffer.size());
99+ file_log_buffer.clear();
100+ if (err < 0) {
101+diff --git a/src/test/crimson/seastore/onode_tree/test_value.h b/src/test/crimson/seastore/onode_tree/test_value.h
102+index 4a2a21b98f..cb826a46f3 100644
103+--- a/src/test/crimson/seastore/onode_tree/test_value.h
104++++ b/src/test/crimson/seastore/onode_tree/test_value.h
105+@@ -138,7 +138,7 @@ class TestValue final : public Value {
106+ }
107+ default:
108+ logger().error("OTree::TestValue::Replay: got unknown op {} when replay {:#x}+{:#x}",
109+- op, value_addr, payload_mut.get_length());
110++ static_cast<int>(op), value_addr, payload_mut.get_length());
111+ ceph_abort();
112+ }
113+ } catch (buffer::error& e) {
114diff --git a/debian/patches/fix-kinetic-misc.patch b/debian/patches/fix-kinetic-misc.patch
115new file mode 100644
116index 0000000..d62e0dc
117--- /dev/null
118+++ b/debian/patches/fix-kinetic-misc.patch
119@@ -0,0 +1,43 @@
120+Description: Build fixes for Ubuntu Kinetic
121+Author: Luciano Lo Giudice <luciano.logiudice@canonical.com>
122+Forwarded: No
123+
124+---
125+diff --git a/src/common/dout.h b/src/common/dout.h
126+index 421222d535..aa4bd8a699 100644
127+--- a/src/common/dout.h
128++++ b/src/common/dout.h
129+@@ -103,7 +103,7 @@ struct dynamic_marker_t {
130+ };
131+
132+ template<typename T>
133+-dynamic_marker_t<T> need_dynamic(T&& t) {
134++constexpr dynamic_marker_t<T> need_dynamic(T&& t) {
135+ return dynamic_marker_t<T>{ std::forward<T>(t) };
136+ }
137+
138+diff --git a/src/include/buffer.h b/src/include/buffer.h
139+index 0c89367dd3..f8fd9573f0 100644
140+--- a/src/include/buffer.h
141++++ b/src/include/buffer.h
142+@@ -49,6 +49,7 @@
143+
144+ #include <exception>
145+ #include <type_traits>
146++#include <memory>
147+
148+ #include "page.h"
149+ #include "crc32c.h"
150+diff --git a/src/spdk/lib/iscsi/iscsi.c b/src/spdk/lib/iscsi/iscsi.c
151+index febf4cac48..88cb41a52e 100644
152+--- a/src/spdk/lib/iscsi/iscsi.c
153++++ b/src/spdk/lib/iscsi/iscsi.c
154+@@ -62,7 +62,7 @@
155+ #define SPDK_CRC32C_INITIAL 0xffffffffUL
156+ #define SPDK_CRC32C_XOR 0xffffffffUL
157+
158+-#ifdef __FreeBSD__
159++#if defined(__FreeBSD__) || __has_include(<bsd/stdlib.h>)
160+ #define HAVE_SRANDOMDEV 1
161+ #define HAVE_ARC4RANDOM 1
162+ #endif
163diff --git a/debian/patches/lp1986747-fix-osd-class-dir.patch b/debian/patches/lp1986747-fix-osd-class-dir.patch
164new file mode 100644
165index 0000000..7c30901
166--- /dev/null
167+++ b/debian/patches/lp1986747-fix-osd-class-dir.patch
168@@ -0,0 +1,23 @@
169+Description: Fix rados-classes search path.
170+ .
171+ The commit 3bee4b0 changed the
172+ base of the osd_class_dir path from CMAKE_INSTALL_FULL_LIBDIR to
173+ CMAKE_INSTALL_LIBDIR. This change aligns the default value with the
174+ correct value.
175+Author: Chris MacNaughton <chris.macnaughton@ubuntu.com>
176+Forwarded: https://github.com/ceph/ceph/pull/47676
177+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1986747
178+
179+Index: ceph/src/common/options/osd.yaml.in
180+===================================================================
181+--- ceph.orig/src/common/options/osd.yaml.in
182++++ ceph/src/common/options/osd.yaml.in
183+@@ -451,7 +451,7 @@ options:
184+ - name: osd_class_dir
185+ type: str
186+ level: advanced
187+- default: @CMAKE_INSTALL_LIBDIR@/rados-classes
188++ default: @CMAKE_INSTALL_FULL_LIBDIR@/rados-classes
189+ fmt_desc: The class path for RADOS class plug-ins.
190+ with_legacy: true
191+ - name: osd_open_classes_on_start
192diff --git a/debian/patches/series b/debian/patches/series
193index 37d667b..555d5b9 100644
194--- a/debian/patches/series
195+++ b/debian/patches/series
196@@ -1,3 +1,7 @@
197+<<<<<<< debian/patches/series
198+=======
199+lp1986747-fix-osd-class-dir.patch
200+>>>>>>> debian/patches/series
201 enable-strsignal.patch
202 update-java-source-target-flags.patch
203 disable-crypto.patch
204@@ -12,3 +16,8 @@ spdk_top-string-format.patch
205 compress-common-depends.patch
206 spdk-fix-make-exe.patch
207 py310-py-ssize-t-compat.patch
208+<<<<<<< debian/patches/series
209+=======
210+fix-kinetic-libfmt.patch
211+fix-kinetic-misc.patch
212+>>>>>>> debian/patches/series
213diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln
214index b752f87..298c0f4 100644
215--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln
216+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln
217@@ -1,3 +1,4 @@
218+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln
219 
220 Microsoft Visual Studio Solution File, Format Version 9.00
221 # Visual Studio 2005
222@@ -30,3 +31,37 @@ Global
223 HideSolutionNode = FALSE
224 EndGlobalSection
225 EndGlobal
226+=======
227+
228+Microsoft Visual Studio Solution File, Format Version 9.00
229+# Visual Studio 2005
230+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
231+EndProject
232+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}"
233+EndProject
234+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}"
235+EndProject
236+Global
237+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
238+ Debug|Win32 = Debug|Win32
239+ Release|Win32 = Release|Win32
240+ EndGlobalSection
241+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
242+ {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32
243+ {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32
244+ {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32
245+ {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32
246+ {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32
247+ {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32
248+ {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32
249+ {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32
250+ {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32
251+ {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32
252+ {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32
253+ {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32
254+ EndGlobalSection
255+ GlobalSection(SolutionProperties) = preSolution
256+ HideSolutionNode = FALSE
257+ EndGlobalSection
258+EndGlobal
259+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.sln
260diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj
261index 4bbfe98..ae97985 100644
262--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj
263+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj
264@@ -1,3 +1,4 @@
265+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj
266 <?xml version="1.0" encoding="Windows-1252"?>
267 <VisualStudioProject
268 ProjectType="Visual C++"
269@@ -189,3 +190,196 @@
270 <Globals>
271 </Globals>
272 </VisualStudioProject>
273+=======
274+<?xml version="1.0" encoding="Windows-1252"?>
275+<VisualStudioProject
276+ ProjectType="Visual C++"
277+ Version="8.00"
278+ Name="gmock"
279+ ProjectGUID="{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
280+ RootNamespace="gmock"
281+ Keyword="Win32Proj"
282+ >
283+ <Platforms>
284+ <Platform
285+ Name="Win32"
286+ />
287+ </Platforms>
288+ <ToolFiles>
289+ </ToolFiles>
290+ <Configurations>
291+ <Configuration
292+ Name="Debug|Win32"
293+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
294+ IntermediateDirectory="$(OutDir)\$(ProjectName)"
295+ ConfigurationType="4"
296+ InheritedPropertySheets=".\gmock_config.vsprops"
297+ CharacterSet="1"
298+ >
299+ <Tool
300+ Name="VCPreBuildEventTool"
301+ />
302+ <Tool
303+ Name="VCCustomBuildTool"
304+ />
305+ <Tool
306+ Name="VCXMLDataGeneratorTool"
307+ />
308+ <Tool
309+ Name="VCWebServiceProxyGeneratorTool"
310+ />
311+ <Tool
312+ Name="VCMIDLTool"
313+ />
314+ <Tool
315+ Name="VCCLCompilerTool"
316+ Optimization="0"
317+ AdditionalIncludeDirectories="..\..\include;..\.."
318+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
319+ MinimalRebuild="true"
320+ BasicRuntimeChecks="3"
321+ RuntimeLibrary="1"
322+ UsePrecompiledHeader="0"
323+ WarningLevel="3"
324+ Detect64BitPortabilityProblems="true"
325+ DebugInformationFormat="3"
326+ />
327+ <Tool
328+ Name="VCManagedResourceCompilerTool"
329+ />
330+ <Tool
331+ Name="VCResourceCompilerTool"
332+ />
333+ <Tool
334+ Name="VCPreLinkEventTool"
335+ />
336+ <Tool
337+ Name="VCLibrarianTool"
338+ />
339+ <Tool
340+ Name="VCALinkTool"
341+ />
342+ <Tool
343+ Name="VCXDCMakeTool"
344+ />
345+ <Tool
346+ Name="VCBscMakeTool"
347+ />
348+ <Tool
349+ Name="VCFxCopTool"
350+ />
351+ <Tool
352+ Name="VCPostBuildEventTool"
353+ />
354+ </Configuration>
355+ <Configuration
356+ Name="Release|Win32"
357+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
358+ IntermediateDirectory="$(OutDir)\$(ProjectName)"
359+ ConfigurationType="4"
360+ InheritedPropertySheets=".\gmock_config.vsprops"
361+ CharacterSet="1"
362+ WholeProgramOptimization="1"
363+ >
364+ <Tool
365+ Name="VCPreBuildEventTool"
366+ />
367+ <Tool
368+ Name="VCCustomBuildTool"
369+ />
370+ <Tool
371+ Name="VCXMLDataGeneratorTool"
372+ />
373+ <Tool
374+ Name="VCWebServiceProxyGeneratorTool"
375+ />
376+ <Tool
377+ Name="VCMIDLTool"
378+ />
379+ <Tool
380+ Name="VCCLCompilerTool"
381+ AdditionalIncludeDirectories="..\..\include;..\.."
382+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
383+ RuntimeLibrary="0"
384+ UsePrecompiledHeader="0"
385+ WarningLevel="3"
386+ Detect64BitPortabilityProblems="true"
387+ DebugInformationFormat="3"
388+ />
389+ <Tool
390+ Name="VCManagedResourceCompilerTool"
391+ />
392+ <Tool
393+ Name="VCResourceCompilerTool"
394+ />
395+ <Tool
396+ Name="VCPreLinkEventTool"
397+ />
398+ <Tool
399+ Name="VCLibrarianTool"
400+ />
401+ <Tool
402+ Name="VCALinkTool"
403+ />
404+ <Tool
405+ Name="VCXDCMakeTool"
406+ />
407+ <Tool
408+ Name="VCBscMakeTool"
409+ />
410+ <Tool
411+ Name="VCFxCopTool"
412+ />
413+ <Tool
414+ Name="VCPostBuildEventTool"
415+ />
416+ </Configuration>
417+ </Configurations>
418+ <References>
419+ </References>
420+ <Files>
421+ <Filter
422+ Name="Source Files"
423+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
424+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
425+ >
426+ <File
427+ RelativePath="..\..\src\gmock-all.cc"
428+ >
429+ </File>
430+ <File
431+ RelativePath="$(GTestDir)\src\gtest-all.cc"
432+ >
433+ <FileConfiguration
434+ Name="Debug|Win32"
435+ >
436+ <Tool
437+ Name="VCCLCompilerTool"
438+ AdditionalIncludeDirectories="$(GTestDir)"
439+ />
440+ </FileConfiguration>
441+ <FileConfiguration
442+ Name="Release|Win32"
443+ >
444+ <Tool
445+ Name="VCCLCompilerTool"
446+ AdditionalIncludeDirectories="$(GTestDir)"
447+ />
448+ </FileConfiguration>
449+ </File>
450+ </Filter>
451+ <Filter
452+ Name="Public Header Files"
453+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
454+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
455+ >
456+ </Filter>
457+ <Filter
458+ Name="Private Header Files"
459+ >
460+ </Filter>
461+ </Files>
462+ <Globals>
463+ </Globals>
464+</VisualStudioProject>
465+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock.vcproj
466diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops
467index 875939c..dc8c348 100644
468--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops
469+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops
470@@ -1,3 +1,4 @@
471+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops
472 <?xml version="1.0" encoding="Windows-1252"?>
473 <VisualStudioPropertySheet
474 ProjectType="Visual C++"
475@@ -13,3 +14,20 @@
476 Value="../../../googletest"
477 />
478 </VisualStudioPropertySheet>
479+=======
480+<?xml version="1.0" encoding="Windows-1252"?>
481+<VisualStudioPropertySheet
482+ ProjectType="Visual C++"
483+ Version="8.00"
484+ Name="gmock_config"
485+ >
486+ <Tool
487+ Name="VCCLCompilerTool"
488+ AdditionalIncludeDirectories="&quot;$(GTestDir)/include&quot;"
489+ />
490+ <UserMacro
491+ Name="GTestDir"
492+ Value="../../../googletest"
493+ />
494+</VisualStudioPropertySheet>
495+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_config.vsprops
496diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj
497index 01505a9..8c01929 100644
498--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj
499+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj
500@@ -1,3 +1,4 @@
501+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj
502 <?xml version="1.0" encoding="Windows-1252"?>
503 <VisualStudioProject
504 ProjectType="Visual C++"
505@@ -185,3 +186,192 @@
506 <Globals>
507 </Globals>
508 </VisualStudioProject>
509+=======
510+<?xml version="1.0" encoding="Windows-1252"?>
511+<VisualStudioProject
512+ ProjectType="Visual C++"
513+ Version="8.00"
514+ Name="gmock_main"
515+ ProjectGUID="{E4EF614B-30DF-4954-8C53-580A0BF6B589}"
516+ RootNamespace="gmock_main"
517+ Keyword="Win32Proj"
518+ >
519+ <Platforms>
520+ <Platform
521+ Name="Win32"
522+ />
523+ </Platforms>
524+ <ToolFiles>
525+ </ToolFiles>
526+ <Configurations>
527+ <Configuration
528+ Name="Debug|Win32"
529+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
530+ IntermediateDirectory="$(OutDir)\$(ProjectName)"
531+ ConfigurationType="4"
532+ InheritedPropertySheets=".\gmock_config.vsprops"
533+ CharacterSet="1"
534+ >
535+ <Tool
536+ Name="VCPreBuildEventTool"
537+ />
538+ <Tool
539+ Name="VCCustomBuildTool"
540+ />
541+ <Tool
542+ Name="VCXMLDataGeneratorTool"
543+ />
544+ <Tool
545+ Name="VCWebServiceProxyGeneratorTool"
546+ />
547+ <Tool
548+ Name="VCMIDLTool"
549+ />
550+ <Tool
551+ Name="VCCLCompilerTool"
552+ Optimization="0"
553+ AdditionalIncludeDirectories="../../include"
554+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
555+ MinimalRebuild="true"
556+ BasicRuntimeChecks="3"
557+ RuntimeLibrary="1"
558+ UsePrecompiledHeader="0"
559+ WarningLevel="3"
560+ Detect64BitPortabilityProblems="true"
561+ DebugInformationFormat="3"
562+ />
563+ <Tool
564+ Name="VCManagedResourceCompilerTool"
565+ />
566+ <Tool
567+ Name="VCResourceCompilerTool"
568+ />
569+ <Tool
570+ Name="VCPreLinkEventTool"
571+ />
572+ <Tool
573+ Name="VCLibrarianTool"
574+ />
575+ <Tool
576+ Name="VCALinkTool"
577+ />
578+ <Tool
579+ Name="VCXDCMakeTool"
580+ />
581+ <Tool
582+ Name="VCBscMakeTool"
583+ />
584+ <Tool
585+ Name="VCFxCopTool"
586+ />
587+ <Tool
588+ Name="VCPostBuildEventTool"
589+ />
590+ </Configuration>
591+ <Configuration
592+ Name="Release|Win32"
593+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
594+ IntermediateDirectory="$(OutDir)\$(ProjectName)"
595+ ConfigurationType="4"
596+ InheritedPropertySheets=".\gmock_config.vsprops"
597+ CharacterSet="1"
598+ WholeProgramOptimization="1"
599+ >
600+ <Tool
601+ Name="VCPreBuildEventTool"
602+ />
603+ <Tool
604+ Name="VCCustomBuildTool"
605+ />
606+ <Tool
607+ Name="VCXMLDataGeneratorTool"
608+ />
609+ <Tool
610+ Name="VCWebServiceProxyGeneratorTool"
611+ />
612+ <Tool
613+ Name="VCMIDLTool"
614+ />
615+ <Tool
616+ Name="VCCLCompilerTool"
617+ AdditionalIncludeDirectories="../../include"
618+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
619+ RuntimeLibrary="0"
620+ UsePrecompiledHeader="0"
621+ WarningLevel="3"
622+ Detect64BitPortabilityProblems="true"
623+ DebugInformationFormat="3"
624+ />
625+ <Tool
626+ Name="VCManagedResourceCompilerTool"
627+ />
628+ <Tool
629+ Name="VCResourceCompilerTool"
630+ />
631+ <Tool
632+ Name="VCPreLinkEventTool"
633+ />
634+ <Tool
635+ Name="VCLibrarianTool"
636+ />
637+ <Tool
638+ Name="VCALinkTool"
639+ />
640+ <Tool
641+ Name="VCXDCMakeTool"
642+ />
643+ <Tool
644+ Name="VCBscMakeTool"
645+ />
646+ <Tool
647+ Name="VCFxCopTool"
648+ />
649+ <Tool
650+ Name="VCPostBuildEventTool"
651+ />
652+ </Configuration>
653+ </Configurations>
654+ <References>
655+ <ProjectReference
656+ ReferencedProjectIdentifier="{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
657+ RelativePathToProject=".\gmock.vcproj"
658+ />
659+ </References>
660+ <Files>
661+ <Filter
662+ Name="Source Files"
663+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
664+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
665+ >
666+ <File
667+ RelativePath="..\..\src\gmock_main.cc"
668+ >
669+ <FileConfiguration
670+ Name="Debug|Win32"
671+ >
672+ <Tool
673+ Name="VCCLCompilerTool"
674+ AdditionalIncludeDirectories="../../include"
675+ />
676+ </FileConfiguration>
677+ <FileConfiguration
678+ Name="Release|Win32"
679+ >
680+ <Tool
681+ Name="VCCLCompilerTool"
682+ AdditionalIncludeDirectories="../../include"
683+ />
684+ </FileConfiguration>
685+ </File>
686+ </Filter>
687+ <Filter
688+ Name="Header Files"
689+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
690+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
691+ >
692+ </Filter>
693+ </Files>
694+ <Globals>
695+ </Globals>
696+</VisualStudioProject>
697+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_main.vcproj
698diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj
699index d1e01e7..3d12fb1 100644
700--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj
701+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj
702@@ -1,3 +1,4 @@
703+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj
704 <?xml version="1.0" encoding="Windows-1252"?>
705 <VisualStudioProject
706 ProjectType="Visual C++"
707@@ -199,3 +200,206 @@
708 <Globals>
709 </Globals>
710 </VisualStudioProject>
711+=======
712+<?xml version="1.0" encoding="Windows-1252"?>
713+<VisualStudioProject
714+ ProjectType="Visual C++"
715+ Version="8.00"
716+ Name="gmock_test"
717+ ProjectGUID="{F10D22F8-AC7B-4213-8720-608E7D878CD2}"
718+ RootNamespace="gmock_test"
719+ Keyword="Win32Proj"
720+ >
721+ <Platforms>
722+ <Platform
723+ Name="Win32"
724+ />
725+ </Platforms>
726+ <ToolFiles>
727+ </ToolFiles>
728+ <Configurations>
729+ <Configuration
730+ Name="Debug|Win32"
731+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
732+ IntermediateDirectory="$(OutDir)\$(ProjectName)"
733+ ConfigurationType="1"
734+ InheritedPropertySheets=".\gmock_config.vsprops"
735+ CharacterSet="1"
736+ >
737+ <Tool
738+ Name="VCPreBuildEventTool"
739+ />
740+ <Tool
741+ Name="VCCustomBuildTool"
742+ />
743+ <Tool
744+ Name="VCXMLDataGeneratorTool"
745+ />
746+ <Tool
747+ Name="VCWebServiceProxyGeneratorTool"
748+ />
749+ <Tool
750+ Name="VCMIDLTool"
751+ />
752+ <Tool
753+ Name="VCCLCompilerTool"
754+ AdditionalOptions="/bigobj"
755+ Optimization="0"
756+ AdditionalIncludeDirectories="..\..\include;..\.."
757+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
758+ MinimalRebuild="true"
759+ BasicRuntimeChecks="3"
760+ RuntimeLibrary="1"
761+ UsePrecompiledHeader="0"
762+ WarningLevel="3"
763+ Detect64BitPortabilityProblems="true"
764+ DebugInformationFormat="3"
765+ />
766+ <Tool
767+ Name="VCManagedResourceCompilerTool"
768+ />
769+ <Tool
770+ Name="VCResourceCompilerTool"
771+ />
772+ <Tool
773+ Name="VCPreLinkEventTool"
774+ />
775+ <Tool
776+ Name="VCLinkerTool"
777+ LinkIncremental="2"
778+ GenerateDebugInformation="true"
779+ SubSystem="1"
780+ TargetMachine="1"
781+ />
782+ <Tool
783+ Name="VCALinkTool"
784+ />
785+ <Tool
786+ Name="VCManifestTool"
787+ />
788+ <Tool
789+ Name="VCXDCMakeTool"
790+ />
791+ <Tool
792+ Name="VCBscMakeTool"
793+ />
794+ <Tool
795+ Name="VCFxCopTool"
796+ />
797+ <Tool
798+ Name="VCAppVerifierTool"
799+ />
800+ <Tool
801+ Name="VCWebDeploymentTool"
802+ />
803+ <Tool
804+ Name="VCPostBuildEventTool"
805+ />
806+ </Configuration>
807+ <Configuration
808+ Name="Release|Win32"
809+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
810+ IntermediateDirectory="$(OutDir)\$(ProjectName)"
811+ ConfigurationType="1"
812+ InheritedPropertySheets=".\gmock_config.vsprops"
813+ CharacterSet="1"
814+ WholeProgramOptimization="1"
815+ >
816+ <Tool
817+ Name="VCPreBuildEventTool"
818+ />
819+ <Tool
820+ Name="VCCustomBuildTool"
821+ />
822+ <Tool
823+ Name="VCXMLDataGeneratorTool"
824+ />
825+ <Tool
826+ Name="VCWebServiceProxyGeneratorTool"
827+ />
828+ <Tool
829+ Name="VCMIDLTool"
830+ />
831+ <Tool
832+ Name="VCCLCompilerTool"
833+ AdditionalOptions="/bigobj"
834+ AdditionalIncludeDirectories="..\..\include;..\.."
835+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
836+ RuntimeLibrary="0"
837+ UsePrecompiledHeader="0"
838+ WarningLevel="3"
839+ Detect64BitPortabilityProblems="true"
840+ DebugInformationFormat="3"
841+ />
842+ <Tool
843+ Name="VCManagedResourceCompilerTool"
844+ />
845+ <Tool
846+ Name="VCResourceCompilerTool"
847+ />
848+ <Tool
849+ Name="VCPreLinkEventTool"
850+ />
851+ <Tool
852+ Name="VCLinkerTool"
853+ LinkIncremental="1"
854+ GenerateDebugInformation="true"
855+ SubSystem="1"
856+ OptimizeReferences="2"
857+ EnableCOMDATFolding="2"
858+ TargetMachine="1"
859+ />
860+ <Tool
861+ Name="VCALinkTool"
862+ />
863+ <Tool
864+ Name="VCManifestTool"
865+ />
866+ <Tool
867+ Name="VCXDCMakeTool"
868+ />
869+ <Tool
870+ Name="VCBscMakeTool"
871+ />
872+ <Tool
873+ Name="VCFxCopTool"
874+ />
875+ <Tool
876+ Name="VCAppVerifierTool"
877+ />
878+ <Tool
879+ Name="VCWebDeploymentTool"
880+ />
881+ <Tool
882+ Name="VCPostBuildEventTool"
883+ />
884+ </Configuration>
885+ </Configurations>
886+ <References>
887+ <ProjectReference
888+ ReferencedProjectIdentifier="{E4EF614B-30DF-4954-8C53-580A0BF6B589}"
889+ RelativePathToProject=".\gmock_main.vcproj"
890+ />
891+ </References>
892+ <Files>
893+ <Filter
894+ Name="Source Files"
895+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
896+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
897+ >
898+ <File
899+ RelativePath="..\..\test\gmock_all_test.cc"
900+ >
901+ </File>
902+ </Filter>
903+ <Filter
904+ Name="Header Files"
905+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
906+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
907+ >
908+ </Filter>
909+ </Files>
910+ <Globals>
911+ </Globals>
912+</VisualStudioProject>
913+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2005/gmock_test.vcproj
914diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln
915index d949656..654add2 100644
916--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln
917+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln
918@@ -1,3 +1,4 @@
919+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln
920 
921 Microsoft Visual Studio Solution File, Format Version 11.00
922 # Visual C++ Express 2010
923@@ -30,3 +31,37 @@ Global
924 HideSolutionNode = FALSE
925 EndGlobalSection
926 EndGlobal
927+=======
928+
929+Microsoft Visual Studio Solution File, Format Version 11.00
930+# Visual C++ Express 2010
931+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcxproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}"
932+EndProject
933+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcxproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}"
934+EndProject
935+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcxproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}"
936+EndProject
937+Global
938+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
939+ Debug|Win32 = Debug|Win32
940+ Release|Win32 = Release|Win32
941+ EndGlobalSection
942+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
943+ {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32
944+ {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32
945+ {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32
946+ {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32
947+ {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32
948+ {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32
949+ {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32
950+ {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32
951+ {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32
952+ {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32
953+ {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32
954+ {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32
955+ EndGlobalSection
956+ GlobalSection(SolutionProperties) = preSolution
957+ HideSolutionNode = FALSE
958+ EndGlobalSection
959+EndGlobal
960+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.sln
961diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj
962index 21a85ef..e1be31f 100644
963--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj
964+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj
965@@ -1,3 +1,4 @@
966+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj
967 <?xml version="1.0" encoding="utf-8"?>
968 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
969 <ItemGroup Label="ProjectConfigurations">
970@@ -80,3 +81,87 @@
971 <ImportGroup Label="ExtensionTargets">
972 </ImportGroup>
973 </Project>
974+=======
975+<?xml version="1.0" encoding="utf-8"?>
976+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
977+ <ItemGroup Label="ProjectConfigurations">
978+ <ProjectConfiguration Include="Debug|Win32">
979+ <Configuration>Debug</Configuration>
980+ <Platform>Win32</Platform>
981+ </ProjectConfiguration>
982+ <ProjectConfiguration Include="Release|Win32">
983+ <Configuration>Release</Configuration>
984+ <Platform>Win32</Platform>
985+ </ProjectConfiguration>
986+ </ItemGroup>
987+ <PropertyGroup Label="Globals">
988+ <ProjectGuid>{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}</ProjectGuid>
989+ <RootNamespace>gmock</RootNamespace>
990+ <Keyword>Win32Proj</Keyword>
991+ </PropertyGroup>
992+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
993+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
994+ <ConfigurationType>StaticLibrary</ConfigurationType>
995+ <CharacterSet>Unicode</CharacterSet>
996+ <WholeProgramOptimization>true</WholeProgramOptimization>
997+ </PropertyGroup>
998+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
999+ <ConfigurationType>StaticLibrary</ConfigurationType>
1000+ <CharacterSet>Unicode</CharacterSet>
1001+ </PropertyGroup>
1002+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
1003+ <ImportGroup Label="ExtensionSettings">
1004+ </ImportGroup>
1005+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
1006+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
1007+ <Import Project="gmock_config.props" />
1008+ </ImportGroup>
1009+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
1010+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
1011+ <Import Project="gmock_config.props" />
1012+ </ImportGroup>
1013+ <PropertyGroup Label="UserMacros" />
1014+ <PropertyGroup>
1015+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
1016+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
1017+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
1018+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
1019+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
1020+ </PropertyGroup>
1021+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
1022+ <ClCompile>
1023+ <Optimization>Disabled</Optimization>
1024+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1025+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1026+ <MinimalRebuild>true</MinimalRebuild>
1027+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
1028+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
1029+ <PrecompiledHeader>
1030+ </PrecompiledHeader>
1031+ <WarningLevel>Level3</WarningLevel>
1032+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
1033+ </ClCompile>
1034+ </ItemDefinitionGroup>
1035+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
1036+ <ClCompile>
1037+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1038+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1039+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
1040+ <PrecompiledHeader>
1041+ </PrecompiledHeader>
1042+ <WarningLevel>Level3</WarningLevel>
1043+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
1044+ </ClCompile>
1045+ </ItemDefinitionGroup>
1046+ <ItemGroup>
1047+ <ClCompile Include="..\..\src\gmock-all.cc" />
1048+ <ClCompile Include="$(GTestDir)\src\gtest-all.cc">
1049+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GTestDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1050+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GTestDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1051+ </ClCompile>
1052+ </ItemGroup>
1053+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
1054+ <ImportGroup Label="ExtensionTargets">
1055+ </ImportGroup>
1056+</Project>
1057+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock.vcxproj
1058diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props
1059index 441f31c..922d670 100644
1060--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props
1061+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props
1062@@ -1,3 +1,4 @@
1063+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props
1064 <?xml version="1.0" encoding="utf-8"?>
1065 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1066 <PropertyGroup Label="UserMacros">
1067@@ -17,3 +18,24 @@
1068 </BuildMacro>
1069 </ItemGroup>
1070 </Project>
1071+=======
1072+<?xml version="1.0" encoding="utf-8"?>
1073+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1074+ <PropertyGroup Label="UserMacros">
1075+ <GTestDir>../../../googletest</GTestDir>
1076+ </PropertyGroup>
1077+ <PropertyGroup>
1078+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
1079+ </PropertyGroup>
1080+ <ItemDefinitionGroup>
1081+ <ClCompile>
1082+ <AdditionalIncludeDirectories>$(GTestDir)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1083+ </ClCompile>
1084+ </ItemDefinitionGroup>
1085+ <ItemGroup>
1086+ <BuildMacro Include="GTestDir">
1087+ <Value>$(GTestDir)</Value>
1088+ </BuildMacro>
1089+ </ItemGroup>
1090+</Project>
1091+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_config.props
1092diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj
1093index 27fecd5..b3af374 100644
1094--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj
1095+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj
1096@@ -1,3 +1,4 @@
1097+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj
1098 <?xml version="1.0" encoding="utf-8"?>
1099 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1100 <ItemGroup Label="ProjectConfigurations">
1101@@ -86,3 +87,93 @@
1102 <ImportGroup Label="ExtensionTargets">
1103 </ImportGroup>
1104 </Project>
1105+=======
1106+<?xml version="1.0" encoding="utf-8"?>
1107+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1108+ <ItemGroup Label="ProjectConfigurations">
1109+ <ProjectConfiguration Include="Debug|Win32">
1110+ <Configuration>Debug</Configuration>
1111+ <Platform>Win32</Platform>
1112+ </ProjectConfiguration>
1113+ <ProjectConfiguration Include="Release|Win32">
1114+ <Configuration>Release</Configuration>
1115+ <Platform>Win32</Platform>
1116+ </ProjectConfiguration>
1117+ </ItemGroup>
1118+ <PropertyGroup Label="Globals">
1119+ <ProjectGuid>{E4EF614B-30DF-4954-8C53-580A0BF6B589}</ProjectGuid>
1120+ <RootNamespace>gmock_main</RootNamespace>
1121+ <Keyword>Win32Proj</Keyword>
1122+ </PropertyGroup>
1123+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1124+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
1125+ <ConfigurationType>StaticLibrary</ConfigurationType>
1126+ <CharacterSet>Unicode</CharacterSet>
1127+ <WholeProgramOptimization>true</WholeProgramOptimization>
1128+ </PropertyGroup>
1129+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
1130+ <ConfigurationType>StaticLibrary</ConfigurationType>
1131+ <CharacterSet>Unicode</CharacterSet>
1132+ </PropertyGroup>
1133+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
1134+ <ImportGroup Label="ExtensionSettings">
1135+ </ImportGroup>
1136+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
1137+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
1138+ <Import Project="gmock_config.props" />
1139+ </ImportGroup>
1140+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
1141+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
1142+ <Import Project="gmock_config.props" />
1143+ </ImportGroup>
1144+ <PropertyGroup Label="UserMacros" />
1145+ <PropertyGroup>
1146+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
1147+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
1148+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
1149+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
1150+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
1151+ </PropertyGroup>
1152+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
1153+ <ClCompile>
1154+ <Optimization>Disabled</Optimization>
1155+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1156+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1157+ <MinimalRebuild>true</MinimalRebuild>
1158+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
1159+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
1160+ <PrecompiledHeader>
1161+ </PrecompiledHeader>
1162+ <WarningLevel>Level3</WarningLevel>
1163+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
1164+ </ClCompile>
1165+ </ItemDefinitionGroup>
1166+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
1167+ <ClCompile>
1168+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1169+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1170+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
1171+ <PrecompiledHeader>
1172+ </PrecompiledHeader>
1173+ <WarningLevel>Level3</WarningLevel>
1174+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
1175+ </ClCompile>
1176+ </ItemDefinitionGroup>
1177+ <ItemGroup>
1178+ <ProjectReference Include="gmock.vcxproj">
1179+ <Project>{34681f0d-ce45-415d-b5f2-5c662dfe3bd5}</Project>
1180+ <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
1181+ <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
1182+ </ProjectReference>
1183+ </ItemGroup>
1184+ <ItemGroup>
1185+ <ClCompile Include="..\..\src\gmock_main.cc">
1186+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1187+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1188+ </ClCompile>
1189+ </ItemGroup>
1190+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
1191+ <ImportGroup Label="ExtensionTargets">
1192+ </ImportGroup>
1193+</Project>
1194+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_main.vcxproj
1195diff --git a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj
1196index 265439e..523d704 100644
1197--- a/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj
1198+++ b/src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj
1199@@ -1,3 +1,4 @@
1200+<<<<<<< src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj
1201 <?xml version="1.0" encoding="utf-8"?>
1202 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1203 <ItemGroup Label="ProjectConfigurations">
1204@@ -99,3 +100,106 @@
1205 <ImportGroup Label="ExtensionTargets">
1206 </ImportGroup>
1207 </Project>
1208+=======
1209+<?xml version="1.0" encoding="utf-8"?>
1210+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1211+ <ItemGroup Label="ProjectConfigurations">
1212+ <ProjectConfiguration Include="Debug|Win32">
1213+ <Configuration>Debug</Configuration>
1214+ <Platform>Win32</Platform>
1215+ </ProjectConfiguration>
1216+ <ProjectConfiguration Include="Release|Win32">
1217+ <Configuration>Release</Configuration>
1218+ <Platform>Win32</Platform>
1219+ </ProjectConfiguration>
1220+ </ItemGroup>
1221+ <PropertyGroup Label="Globals">
1222+ <ProjectGuid>{F10D22F8-AC7B-4213-8720-608E7D878CD2}</ProjectGuid>
1223+ <RootNamespace>gmock_test</RootNamespace>
1224+ <Keyword>Win32Proj</Keyword>
1225+ </PropertyGroup>
1226+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1227+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
1228+ <ConfigurationType>Application</ConfigurationType>
1229+ <CharacterSet>Unicode</CharacterSet>
1230+ <WholeProgramOptimization>true</WholeProgramOptimization>
1231+ </PropertyGroup>
1232+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
1233+ <ConfigurationType>Application</ConfigurationType>
1234+ <CharacterSet>Unicode</CharacterSet>
1235+ </PropertyGroup>
1236+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
1237+ <ImportGroup Label="ExtensionSettings">
1238+ </ImportGroup>
1239+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
1240+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
1241+ <Import Project="gmock_config.props" />
1242+ </ImportGroup>
1243+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
1244+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
1245+ <Import Project="gmock_config.props" />
1246+ </ImportGroup>
1247+ <PropertyGroup Label="UserMacros" />
1248+ <PropertyGroup>
1249+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
1250+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
1251+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(ProjectName)\</IntDir>
1252+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
1253+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
1254+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(ProjectName)\</IntDir>
1255+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
1256+ </PropertyGroup>
1257+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
1258+ <ClCompile>
1259+ <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
1260+ <Optimization>Disabled</Optimization>
1261+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1262+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1263+ <MinimalRebuild>true</MinimalRebuild>
1264+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
1265+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
1266+ <PrecompiledHeader>
1267+ </PrecompiledHeader>
1268+ <WarningLevel>Level3</WarningLevel>
1269+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
1270+ </ClCompile>
1271+ <Link>
1272+ <GenerateDebugInformation>true</GenerateDebugInformation>
1273+ <SubSystem>Console</SubSystem>
1274+ <TargetMachine>MachineX86</TargetMachine>
1275+ </Link>
1276+ </ItemDefinitionGroup>
1277+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
1278+ <ClCompile>
1279+ <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
1280+ <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1281+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1282+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
1283+ <PrecompiledHeader>
1284+ </PrecompiledHeader>
1285+ <WarningLevel>Level3</WarningLevel>
1286+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
1287+ </ClCompile>
1288+ <Link>
1289+ <GenerateDebugInformation>true</GenerateDebugInformation>
1290+ <SubSystem>Console</SubSystem>
1291+ <OptimizeReferences>true</OptimizeReferences>
1292+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
1293+ <TargetMachine>MachineX86</TargetMachine>
1294+ </Link>
1295+ </ItemDefinitionGroup>
1296+ <ItemGroup>
1297+ <ProjectReference Include="gmock_main.vcxproj">
1298+ <Project>{e4ef614b-30df-4954-8c53-580a0bf6b589}</Project>
1299+ <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
1300+ <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
1301+ </ProjectReference>
1302+ </ItemGroup>
1303+ <ItemGroup>
1304+ <ClCompile Include="..\..\test\gmock_all_test.cc" />
1305+ </ItemGroup>
1306+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
1307+ <ImportGroup Label="ExtensionTargets">
1308+ </ImportGroup>
1309+</Project>
1310+>>>>>>> src/rapidjson/thirdparty/gtest/googlemock/msvc/2010/gmock_test.vcxproj
1311diff --git a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj
1312index 95c3054..68f22a5 100644
1313--- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj
1314+++ b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj
1315@@ -1,3 +1,4 @@
1316+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj
1317 <?xml version="1.0" encoding="utf-8"?>
1318 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1319 <PropertyGroup>
1320@@ -135,4 +136,143 @@
1321 <Key>Cfg_2</Key>
1322 </BuildConfiguration>
1323 </ItemGroup>
1324+=======
1325+<?xml version="1.0" encoding="utf-8"?>
1326+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1327+ <PropertyGroup>
1328+ <ProjectGuid>{bca37a72-5b07-46cf-b44e-89f8e06451a2}</ProjectGuid>
1329+ <Config Condition="'$(Config)'==''">Release</Config>
1330+ </PropertyGroup>
1331+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1332+ <Base>true</Base>
1333+ </PropertyGroup>
1334+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
1335+ <Base>true</Base>
1336+ <Cfg_1>true</Cfg_1>
1337+ <CfgParent>Base</CfgParent>
1338+ </PropertyGroup>
1339+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
1340+ <Base>true</Base>
1341+ <Cfg_2>true</Cfg_2>
1342+ <CfgParent>Base</CfgParent>
1343+ </PropertyGroup>
1344+ <PropertyGroup Condition="'$(Base)'!=''">
1345+ <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
1346+ <OutputExt>lib</OutputExt>
1347+ <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
1348+ <Defines>NO_STRICT</Defines>
1349+ <DynamicRTL>true</DynamicRTL>
1350+ <UsePackages>true</UsePackages>
1351+ <ProjectType>CppStaticLibrary</ProjectType>
1352+ <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>
1353+ <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi</PackageImports>
1354+ <BCC_wpar>false</BCC_wpar>
1355+ <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</IncludePath>
1356+ <AllPackageLibs>rtl.lib;vcl.lib</AllPackageLibs>
1357+ <TLIB_PageSize>32</TLIB_PageSize>
1358+ <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</ILINK_LibraryPath>
1359+ </PropertyGroup>
1360+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
1361+ <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
1362+ <DCC_Optimize>false</DCC_Optimize>
1363+ <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
1364+ <Defines>_DEBUG;$(Defines)</Defines>
1365+ <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
1366+ <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
1367+ <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
1368+ <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
1369+ <DCC_Define>DEBUG</DCC_Define>
1370+ <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
1371+ <IntermediateOutputDir>Debug</IntermediateOutputDir>
1372+ <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
1373+ <BCC_StackFrames>true</BCC_StackFrames>
1374+ <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
1375+ <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
1376+ <TASM_Debugging>Full</TASM_Debugging>
1377+ <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
1378+ </PropertyGroup>
1379+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
1380+ <Defines>NDEBUG;$(Defines)</Defines>
1381+ <IntermediateOutputDir>Release</IntermediateOutputDir>
1382+ <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>
1383+ <TASM_Debugging>None</TASM_Debugging>
1384+ </PropertyGroup>
1385+ <ProjectExtensions>
1386+ <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
1387+ <Borland.ProjectType>CppStaticLibrary</Borland.ProjectType>
1388+ <BorlandProject>
1389+<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>
1390+
1391+
1392+ <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
1393+ <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
1394+ </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Count">1</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item0">32</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item1">16</HistoryLists_hlTLIB_PageSize></HistoryLists_hlTLIB_PageSize></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
1395+ </ProjectExtensions>
1396+ <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
1397+ <ItemGroup>
1398+ <None Include="..\include\gtest\gtest-death-test.h">
1399+ <BuildOrder>3</BuildOrder>
1400+ </None>
1401+ <None Include="..\include\gtest\gtest-message.h">
1402+ <BuildOrder>4</BuildOrder>
1403+ </None>
1404+ <None Include="..\include\gtest\gtest-param-test.h">
1405+ <BuildOrder>5</BuildOrder>
1406+ </None>
1407+ <None Include="..\include\gtest\gtest-spi.h">
1408+ <BuildOrder>6</BuildOrder>
1409+ </None>
1410+ <None Include="..\include\gtest\gtest-test-part.h">
1411+ <BuildOrder>7</BuildOrder>
1412+ </None>
1413+ <None Include="..\include\gtest\gtest-typed-test.h">
1414+ <BuildOrder>8</BuildOrder>
1415+ </None>
1416+ <None Include="..\include\gtest\gtest.h">
1417+ <BuildOrder>0</BuildOrder>
1418+ </None>
1419+ <None Include="..\include\gtest\gtest_pred_impl.h">
1420+ <BuildOrder>1</BuildOrder>
1421+ </None>
1422+ <None Include="..\include\gtest\gtest_prod.h">
1423+ <BuildOrder>2</BuildOrder>
1424+ </None>
1425+ <None Include="..\include\gtest\internal\gtest-death-test-internal.h">
1426+ <BuildOrder>9</BuildOrder>
1427+ </None>
1428+ <None Include="..\include\gtest\internal\gtest-filepath.h">
1429+ <BuildOrder>10</BuildOrder>
1430+ </None>
1431+ <None Include="..\include\gtest\internal\gtest-internal.h">
1432+ <BuildOrder>11</BuildOrder>
1433+ </None>
1434+ <None Include="..\include\gtest\internal\gtest-linked_ptr.h">
1435+ <BuildOrder>12</BuildOrder>
1436+ </None>
1437+ <None Include="..\include\gtest\internal\gtest-param-util-generated.h">
1438+ <BuildOrder>14</BuildOrder>
1439+ </None>
1440+ <None Include="..\include\gtest\internal\gtest-param-util.h">
1441+ <BuildOrder>13</BuildOrder>
1442+ </None>
1443+ <None Include="..\include\gtest\internal\gtest-port.h">
1444+ <BuildOrder>15</BuildOrder>
1445+ </None>
1446+ <None Include="..\include\gtest\internal\gtest-string.h">
1447+ <BuildOrder>16</BuildOrder>
1448+ </None>
1449+ <None Include="..\include\gtest\internal\gtest-type-util.h">
1450+ <BuildOrder>17</BuildOrder>
1451+ </None>
1452+ <CppCompile Include="gtest_all.cc">
1453+ <BuildOrder>18</BuildOrder>
1454+ </CppCompile>
1455+ <BuildConfiguration Include="Debug">
1456+ <Key>Cfg_1</Key>
1457+ </BuildConfiguration>
1458+ <BuildConfiguration Include="Release">
1459+ <Key>Cfg_2</Key>
1460+ </BuildConfiguration>
1461+ </ItemGroup>
1462+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.cbproj
1463 </Project>
1464\ No newline at end of file
1465diff --git a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj
1466index faf31ca..0d7a5e9 100644
1467--- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj
1468+++ b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj
1469@@ -1,3 +1,4 @@
1470+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj
1471 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1472 <PropertyGroup>
1473 <ProjectGuid>{c1d923e0-6cba-4332-9b6f-3420acbf5091}</ProjectGuid>
1474@@ -51,4 +52,59 @@
1475 <CallTarget Targets="gtest:Make;gtest_main:Make;gtest_unittest:Make" />
1476 </Target>
1477 <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
1478+=======
1479+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1480+ <PropertyGroup>
1481+ <ProjectGuid>{c1d923e0-6cba-4332-9b6f-3420acbf5091}</ProjectGuid>
1482+ </PropertyGroup>
1483+ <ItemGroup />
1484+ <ItemGroup>
1485+ <Projects Include="gtest.cbproj" />
1486+ <Projects Include="gtest_main.cbproj" />
1487+ <Projects Include="gtest_unittest.cbproj" />
1488+ </ItemGroup>
1489+ <ProjectExtensions>
1490+ <Borland.Personality>Default.Personality</Borland.Personality>
1491+ <Borland.ProjectType />
1492+ <BorlandProject>
1493+<BorlandProject xmlns=""><Default.Personality></Default.Personality></BorlandProject></BorlandProject>
1494+ </ProjectExtensions>
1495+ <Target Name="gtest">
1496+ <MSBuild Projects="gtest.cbproj" Targets="" />
1497+ </Target>
1498+ <Target Name="gtest:Clean">
1499+ <MSBuild Projects="gtest.cbproj" Targets="Clean" />
1500+ </Target>
1501+ <Target Name="gtest:Make">
1502+ <MSBuild Projects="gtest.cbproj" Targets="Make" />
1503+ </Target>
1504+ <Target Name="gtest_main">
1505+ <MSBuild Projects="gtest_main.cbproj" Targets="" />
1506+ </Target>
1507+ <Target Name="gtest_main:Clean">
1508+ <MSBuild Projects="gtest_main.cbproj" Targets="Clean" />
1509+ </Target>
1510+ <Target Name="gtest_main:Make">
1511+ <MSBuild Projects="gtest_main.cbproj" Targets="Make" />
1512+ </Target>
1513+ <Target Name="gtest_unittest">
1514+ <MSBuild Projects="gtest_unittest.cbproj" Targets="" />
1515+ </Target>
1516+ <Target Name="gtest_unittest:Clean">
1517+ <MSBuild Projects="gtest_unittest.cbproj" Targets="Clean" />
1518+ </Target>
1519+ <Target Name="gtest_unittest:Make">
1520+ <MSBuild Projects="gtest_unittest.cbproj" Targets="Make" />
1521+ </Target>
1522+ <Target Name="Build">
1523+ <CallTarget Targets="gtest;gtest_main;gtest_unittest" />
1524+ </Target>
1525+ <Target Name="Clean">
1526+ <CallTarget Targets="gtest:Clean;gtest_main:Clean;gtest_unittest:Clean" />
1527+ </Target>
1528+ <Target Name="Make">
1529+ <CallTarget Targets="gtest:Make;gtest_main:Make;gtest_unittest:Make" />
1530+ </Target>
1531+ <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
1532+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/codegear/gtest.groupproj
1533 </Project>
1534\ No newline at end of file
1535diff --git a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc
1536index 121b2d8..e36ba5e 100644
1537--- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc
1538+++ b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc
1539@@ -1,3 +1,4 @@
1540+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc
1541 // Copyright 2009, Google Inc.
1542 // All rights reserved.
1543 //
1544@@ -36,3 +37,43 @@
1545 // This file serves as a workaround.
1546
1547 #include "src/gtest-all.cc"
1548+=======
1549+// Copyright 2009, Google Inc.
1550+// All rights reserved.
1551+//
1552+// Redistribution and use in source and binary forms, with or without
1553+// modification, are permitted provided that the following conditions are
1554+// met:
1555+//
1556+// * Redistributions of source code must retain the above copyright
1557+// notice, this list of conditions and the following disclaimer.
1558+// * Redistributions in binary form must reproduce the above
1559+// copyright notice, this list of conditions and the following disclaimer
1560+// in the documentation and/or other materials provided with the
1561+// distribution.
1562+// * Neither the name of Google Inc. nor the names of its
1563+// contributors may be used to endorse or promote products derived from
1564+// this software without specific prior written permission.
1565+//
1566+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1567+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1568+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1569+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1570+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1571+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1572+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1573+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1574+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1575+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1576+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1577+//
1578+// Author: Josh Kelley (joshkel@gmail.com)
1579+//
1580+// Google C++ Testing Framework (Google Test)
1581+//
1582+// C++Builder's IDE cannot build a static library from files with hyphens
1583+// in their name. See http://qc.codegear.com/wc/qcmain.aspx?d=70977 .
1584+// This file serves as a workaround.
1585+
1586+#include "src/gtest-all.cc"
1587+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_all.cc
1588diff --git a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc
1589index 918eccd..9c417c2 100644
1590--- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc
1591+++ b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc
1592@@ -1,3 +1,4 @@
1593+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc
1594 // Copyright 2009, Google Inc.
1595 // All rights reserved.
1596 //
1597@@ -38,3 +39,45 @@
1598
1599 #pragma link "gtest.lib"
1600 #pragma link "gtest_main.lib"
1601+=======
1602+// Copyright 2009, Google Inc.
1603+// All rights reserved.
1604+//
1605+// Redistribution and use in source and binary forms, with or without
1606+// modification, are permitted provided that the following conditions are
1607+// met:
1608+//
1609+// * Redistributions of source code must retain the above copyright
1610+// notice, this list of conditions and the following disclaimer.
1611+// * Redistributions in binary form must reproduce the above
1612+// copyright notice, this list of conditions and the following disclaimer
1613+// in the documentation and/or other materials provided with the
1614+// distribution.
1615+// * Neither the name of Google Inc. nor the names of its
1616+// contributors may be used to endorse or promote products derived from
1617+// this software without specific prior written permission.
1618+//
1619+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1620+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1621+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1622+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1623+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1624+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1625+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1626+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1627+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1628+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1629+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1630+//
1631+// Author: Josh Kelley (joshkel@gmail.com)
1632+//
1633+// Google C++ Testing Framework (Google Test)
1634+//
1635+// Links gtest.lib and gtest_main.lib into the current project in C++Builder.
1636+// This means that these libraries can't be renamed, but it's the only way to
1637+// ensure that Debug versus Release test builds are linked against the
1638+// appropriate Debug or Release build of the libraries.
1639+
1640+#pragma link "gtest.lib"
1641+#pragma link "gtest_main.lib"
1642+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_link.cc
1643diff --git a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj
1644index d76ce13..87d0c89 100644
1645--- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj
1646+++ b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj
1647@@ -1,3 +1,4 @@
1648+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj
1649 <?xml version="1.0" encoding="utf-8"?>
1650 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1651 <PropertyGroup>
1652@@ -80,3 +81,87 @@
1653 </BuildConfiguration>
1654 </ItemGroup>
1655 </Project>
1656+=======
1657+<?xml version="1.0" encoding="utf-8"?>
1658+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1659+ <PropertyGroup>
1660+ <ProjectGuid>{bca37a72-5b07-46cf-b44e-89f8e06451a2}</ProjectGuid>
1661+ <Config Condition="'$(Config)'==''">Release</Config>
1662+ </PropertyGroup>
1663+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1664+ <Base>true</Base>
1665+ </PropertyGroup>
1666+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
1667+ <Base>true</Base>
1668+ <Cfg_1>true</Cfg_1>
1669+ <CfgParent>Base</CfgParent>
1670+ </PropertyGroup>
1671+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
1672+ <Base>true</Base>
1673+ <Cfg_2>true</Cfg_2>
1674+ <CfgParent>Base</CfgParent>
1675+ </PropertyGroup>
1676+ <PropertyGroup Condition="'$(Base)'!=''">
1677+ <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
1678+ <OutputExt>lib</OutputExt>
1679+ <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
1680+ <Defines>NO_STRICT</Defines>
1681+ <DynamicRTL>true</DynamicRTL>
1682+ <UsePackages>true</UsePackages>
1683+ <ProjectType>CppStaticLibrary</ProjectType>
1684+ <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>
1685+ <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi</PackageImports>
1686+ <BCC_wpar>false</BCC_wpar>
1687+ <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</IncludePath>
1688+ <AllPackageLibs>rtl.lib;vcl.lib</AllPackageLibs>
1689+ <TLIB_PageSize>32</TLIB_PageSize>
1690+ <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</ILINK_LibraryPath>
1691+ </PropertyGroup>
1692+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
1693+ <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
1694+ <DCC_Optimize>false</DCC_Optimize>
1695+ <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
1696+ <Defines>_DEBUG;$(Defines)</Defines>
1697+ <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
1698+ <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
1699+ <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
1700+ <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
1701+ <DCC_Define>DEBUG</DCC_Define>
1702+ <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
1703+ <IntermediateOutputDir>Debug</IntermediateOutputDir>
1704+ <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
1705+ <BCC_StackFrames>true</BCC_StackFrames>
1706+ <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
1707+ <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
1708+ <TASM_Debugging>Full</TASM_Debugging>
1709+ <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
1710+ </PropertyGroup>
1711+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
1712+ <Defines>NDEBUG;$(Defines)</Defines>
1713+ <IntermediateOutputDir>Release</IntermediateOutputDir>
1714+ <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>
1715+ <TASM_Debugging>None</TASM_Debugging>
1716+ </PropertyGroup>
1717+ <ProjectExtensions>
1718+ <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
1719+ <Borland.ProjectType>CppStaticLibrary</Borland.ProjectType>
1720+ <BorlandProject>
1721+<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>
1722+ <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
1723+ <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
1724+ </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Count">1</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item0">32</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item1">16</HistoryLists_hlTLIB_PageSize></HistoryLists_hlTLIB_PageSize></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
1725+ </ProjectExtensions>
1726+ <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
1727+ <ItemGroup>
1728+ <CppCompile Include="..\src\gtest_main.cc">
1729+ <BuildOrder>0</BuildOrder>
1730+ </CppCompile>
1731+ <BuildConfiguration Include="Debug">
1732+ <Key>Cfg_1</Key>
1733+ </BuildConfiguration>
1734+ <BuildConfiguration Include="Release">
1735+ <Key>Cfg_2</Key>
1736+ </BuildConfiguration>
1737+ </ItemGroup>
1738+</Project>
1739+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_main.cbproj
1740diff --git a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj
1741index dc5db8e..c837817 100644
1742--- a/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj
1743+++ b/src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj
1744@@ -1,3 +1,4 @@
1745+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj
1746 <?xml version="1.0" encoding="utf-8"?>
1747 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1748 <PropertyGroup>
1749@@ -85,4 +86,93 @@
1750 <Key>Cfg_2</Key>
1751 </BuildConfiguration>
1752 </ItemGroup>
1753+=======
1754+<?xml version="1.0" encoding="utf-8"?>
1755+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1756+ <PropertyGroup>
1757+ <ProjectGuid>{eea63393-5ac5-4b9c-8909-d75fef2daa41}</ProjectGuid>
1758+ <Config Condition="'$(Config)'==''">Release</Config>
1759+ </PropertyGroup>
1760+ <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1761+ <Base>true</Base>
1762+ </PropertyGroup>
1763+ <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
1764+ <Base>true</Base>
1765+ <Cfg_1>true</Cfg_1>
1766+ <CfgParent>Base</CfgParent>
1767+ </PropertyGroup>
1768+ <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
1769+ <Base>true</Base>
1770+ <Cfg_2>true</Cfg_2>
1771+ <CfgParent>Base</CfgParent>
1772+ </PropertyGroup>
1773+ <PropertyGroup Condition="'$(Base)'!=''">
1774+ <OutputExt>exe</OutputExt>
1775+ <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
1776+ <Defines>NO_STRICT</Defines>
1777+ <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
1778+ <DynamicRTL>true</DynamicRTL>
1779+ <ILINK_ObjectSearchPath>..\test</ILINK_ObjectSearchPath>
1780+ <UsePackages>true</UsePackages>
1781+ <ProjectType>CppConsoleApplication</ProjectType>
1782+ <NoVCL>true</NoVCL>
1783+ <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>
1784+ <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi</PackageImports>
1785+ <BCC_wpar>false</BCC_wpar>
1786+ <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</IncludePath>
1787+ <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</ILINK_LibraryPath>
1788+ <Multithreaded>true</Multithreaded>
1789+ </PropertyGroup>
1790+ <PropertyGroup Condition="'$(Cfg_1)'!=''">
1791+ <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
1792+ <DCC_Optimize>false</DCC_Optimize>
1793+ <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
1794+ <Defines>_DEBUG;$(Defines)</Defines>
1795+ <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
1796+ <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
1797+ <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
1798+ <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
1799+ <DCC_Define>DEBUG</DCC_Define>
1800+ <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
1801+ <IntermediateOutputDir>Debug</IntermediateOutputDir>
1802+ <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
1803+ <BCC_StackFrames>true</BCC_StackFrames>
1804+ <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
1805+ <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
1806+ <TASM_Debugging>Full</TASM_Debugging>
1807+ <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
1808+ </PropertyGroup>
1809+ <PropertyGroup Condition="'$(Cfg_2)'!=''">
1810+ <Defines>NDEBUG;$(Defines)</Defines>
1811+ <IntermediateOutputDir>Release</IntermediateOutputDir>
1812+ <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>
1813+ <TASM_Debugging>None</TASM_Debugging>
1814+ </PropertyGroup>
1815+ <ProjectExtensions>
1816+ <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
1817+ <Borland.ProjectType>CppConsoleApplication</Borland.ProjectType>
1818+ <BorlandProject>
1819+<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>
1820+
1821+
1822+ <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
1823+ <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
1824+ </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item1">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item2">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(OUTPUTDIR);..\test</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">2</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item1">STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
1825+ </ProjectExtensions>
1826+ <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
1827+ <ItemGroup>
1828+ <CppCompile Include="..\test\gtest_unittest.cc">
1829+ <BuildOrder>0</BuildOrder>
1830+ </CppCompile>
1831+ <CppCompile Include="gtest_link.cc">
1832+ <BuildOrder>1</BuildOrder>
1833+ </CppCompile>
1834+ <BuildConfiguration Include="Debug">
1835+ <Key>Cfg_1</Key>
1836+ </BuildConfiguration>
1837+ <BuildConfiguration Include="Release">
1838+ <Key>Cfg_2</Key>
1839+ </BuildConfiguration>
1840+ </ItemGroup>
1841+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/codegear/gtest_unittest.cbproj
1842 </Project>
1843\ No newline at end of file
1844diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln
1845index f7908da..49e5ab4 100644
1846--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln
1847+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln
1848@@ -1,3 +1,4 @@
1849+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln
1850 Microsoft Visual Studio Solution File, Format Version 8.00
1851 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
1852 ProjectSection(ProjectDependencies) = postProject
1853@@ -43,3 +44,50 @@ Global
1854 GlobalSection(ExtensibilityAddIns) = postSolution
1855 EndGlobalSection
1856 EndGlobal
1857+=======
1858+Microsoft Visual Studio Solution File, Format Version 8.00
1859+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-md", "gtest-md.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
1860+ ProjectSection(ProjectDependencies) = postProject
1861+ EndProjectSection
1862+EndProject
1863+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main-md", "gtest_main-md.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862033}"
1864+ ProjectSection(ProjectDependencies) = postProject
1865+ EndProjectSection
1866+EndProject
1867+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test-md", "gtest_prod_test-md.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}"
1868+ ProjectSection(ProjectDependencies) = postProject
1869+ EndProjectSection
1870+EndProject
1871+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest-md", "gtest_unittest-md.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}"
1872+ ProjectSection(ProjectDependencies) = postProject
1873+ EndProjectSection
1874+EndProject
1875+Global
1876+ GlobalSection(SolutionConfiguration) = preSolution
1877+ Debug = Debug
1878+ Release = Release
1879+ EndGlobalSection
1880+ GlobalSection(ProjectConfiguration) = postSolution
1881+ {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.ActiveCfg = Debug|Win32
1882+ {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug.Build.0 = Debug|Win32
1883+ {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.ActiveCfg = Release|Win32
1884+ {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release.Build.0 = Release|Win32
1885+ {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.ActiveCfg = Debug|Win32
1886+ {3AF54C8A-10BF-4332-9147-F68ED9862033}.Debug.Build.0 = Debug|Win32
1887+ {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.ActiveCfg = Release|Win32
1888+ {3AF54C8A-10BF-4332-9147-F68ED9862033}.Release.Build.0 = Release|Win32
1889+ {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.ActiveCfg = Debug|Win32
1890+ {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Debug.Build.0 = Debug|Win32
1891+ {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.ActiveCfg = Release|Win32
1892+ {24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}.Release.Build.0 = Release|Win32
1893+ {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.ActiveCfg = Debug|Win32
1894+ {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Debug.Build.0 = Debug|Win32
1895+ {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.ActiveCfg = Release|Win32
1896+ {4D9FDFB5-986A-4139-823C-F4EE0ED481A2}.Release.Build.0 = Release|Win32
1897+ EndGlobalSection
1898+ GlobalSection(ExtensibilityGlobals) = postSolution
1899+ EndGlobalSection
1900+ GlobalSection(ExtensibilityAddIns) = postSolution
1901+ EndGlobalSection
1902+EndGlobal
1903+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.sln
1904diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj
1905index 1c35c3a..569cee8 100644
1906--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj
1907+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj
1908@@ -1,3 +1,4 @@
1909+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj
1910 <?xml version="1.0" encoding="Windows-1252"?>
1911 <VisualStudioProject
1912 ProjectType="Visual C++"
1913@@ -124,3 +125,131 @@
1914 <Globals>
1915 </Globals>
1916 </VisualStudioProject>
1917+=======
1918+<?xml version="1.0" encoding="Windows-1252"?>
1919+<VisualStudioProject
1920+ ProjectType="Visual C++"
1921+ Version="7.10"
1922+ Name="gtest-md"
1923+ ProjectGUID="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
1924+ Keyword="Win32Proj">
1925+ <Platforms>
1926+ <Platform
1927+ Name="Win32"/>
1928+ </Platforms>
1929+ <Configurations>
1930+ <Configuration
1931+ Name="Debug|Win32"
1932+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
1933+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
1934+ ConfigurationType="4"
1935+ CharacterSet="2"
1936+ ReferencesPath="">
1937+ <Tool
1938+ Name="VCCLCompilerTool"
1939+ Optimization="0"
1940+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
1941+ MinimalRebuild="TRUE"
1942+ BasicRuntimeChecks="3"
1943+ RuntimeLibrary="3"
1944+ UsePrecompiledHeader="0"
1945+ WarningLevel="3"
1946+ Detect64BitPortabilityProblems="FALSE"
1947+ DebugInformationFormat="4"/>
1948+ <Tool
1949+ Name="VCCustomBuildTool"/>
1950+ <Tool
1951+ Name="VCLibrarianTool"
1952+ OutputFile="$(OutDir)/gtestd.lib"/>
1953+ <Tool
1954+ Name="VCMIDLTool"/>
1955+ <Tool
1956+ Name="VCPostBuildEventTool"/>
1957+ <Tool
1958+ Name="VCPreBuildEventTool"/>
1959+ <Tool
1960+ Name="VCPreLinkEventTool"/>
1961+ <Tool
1962+ Name="VCResourceCompilerTool"/>
1963+ <Tool
1964+ Name="VCWebServiceProxyGeneratorTool"/>
1965+ <Tool
1966+ Name="VCXMLDataGeneratorTool"/>
1967+ <Tool
1968+ Name="VCManagedWrapperGeneratorTool"/>
1969+ <Tool
1970+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
1971+ </Configuration>
1972+ <Configuration
1973+ Name="Release|Win32"
1974+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
1975+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
1976+ ConfigurationType="4"
1977+ CharacterSet="2"
1978+ ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
1979+ <Tool
1980+ Name="VCCLCompilerTool"
1981+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
1982+ RuntimeLibrary="2"
1983+ UsePrecompiledHeader="0"
1984+ WarningLevel="3"
1985+ Detect64BitPortabilityProblems="FALSE"
1986+ DebugInformationFormat="3"/>
1987+ <Tool
1988+ Name="VCCustomBuildTool"/>
1989+ <Tool
1990+ Name="VCLibrarianTool"
1991+ OutputFile="$(OutDir)/gtest.lib"/>
1992+ <Tool
1993+ Name="VCMIDLTool"/>
1994+ <Tool
1995+ Name="VCPostBuildEventTool"/>
1996+ <Tool
1997+ Name="VCPreBuildEventTool"/>
1998+ <Tool
1999+ Name="VCPreLinkEventTool"/>
2000+ <Tool
2001+ Name="VCResourceCompilerTool"/>
2002+ <Tool
2003+ Name="VCWebServiceProxyGeneratorTool"/>
2004+ <Tool
2005+ Name="VCXMLDataGeneratorTool"/>
2006+ <Tool
2007+ Name="VCManagedWrapperGeneratorTool"/>
2008+ <Tool
2009+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2010+ </Configuration>
2011+ </Configurations>
2012+ <References>
2013+ </References>
2014+ <Files>
2015+ <Filter
2016+ Name="Source Files"
2017+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
2018+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
2019+ <File
2020+ RelativePath="..\src\gtest-all.cc">
2021+ <FileConfiguration
2022+ Name="Debug|Win32">
2023+ <Tool
2024+ Name="VCCLCompilerTool"
2025+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
2026+ </FileConfiguration>
2027+ <FileConfiguration
2028+ Name="Release|Win32">
2029+ <Tool
2030+ Name="VCCLCompilerTool"
2031+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
2032+ </FileConfiguration>
2033+ </File>
2034+ </Filter>
2035+ <Filter
2036+ Name="Header Files"
2037+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
2038+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
2039+ </Filter>
2040+ </Files>
2041+ <Globals>
2042+ </Globals>
2043+</VisualStudioProject>
2044+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest-md.vcproj
2045diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln
2046index ef4b057..f6c40db 100644
2047--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln
2048+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln
2049@@ -1,3 +1,4 @@
2050+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln
2051 Microsoft Visual Studio Solution File, Format Version 8.00
2052 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
2053 ProjectSection(ProjectDependencies) = postProject
2054@@ -43,3 +44,50 @@ Global
2055 GlobalSection(ExtensibilityAddIns) = postSolution
2056 EndGlobalSection
2057 EndGlobal
2058+=======
2059+Microsoft Visual Studio Solution File, Format Version 8.00
2060+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcproj", "{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
2061+ ProjectSection(ProjectDependencies) = postProject
2062+ EndProjectSection
2063+EndProject
2064+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_main", "gtest_main.vcproj", "{3AF54C8A-10BF-4332-9147-F68ED9862032}"
2065+ ProjectSection(ProjectDependencies) = postProject
2066+ EndProjectSection
2067+EndProject
2068+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_unittest", "gtest_unittest.vcproj", "{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}"
2069+ ProjectSection(ProjectDependencies) = postProject
2070+ EndProjectSection
2071+EndProject
2072+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest_prod_test", "gtest_prod_test.vcproj", "{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}"
2073+ ProjectSection(ProjectDependencies) = postProject
2074+ EndProjectSection
2075+EndProject
2076+Global
2077+ GlobalSection(SolutionConfiguration) = preSolution
2078+ Debug = Debug
2079+ Release = Release
2080+ EndGlobalSection
2081+ GlobalSection(ProjectConfiguration) = postSolution
2082+ {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.ActiveCfg = Debug|Win32
2083+ {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Debug.Build.0 = Debug|Win32
2084+ {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.ActiveCfg = Release|Win32
2085+ {C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}.Release.Build.0 = Release|Win32
2086+ {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.ActiveCfg = Debug|Win32
2087+ {3AF54C8A-10BF-4332-9147-F68ED9862032}.Debug.Build.0 = Debug|Win32
2088+ {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.ActiveCfg = Release|Win32
2089+ {3AF54C8A-10BF-4332-9147-F68ED9862032}.Release.Build.0 = Release|Win32
2090+ {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.ActiveCfg = Debug|Win32
2091+ {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Debug.Build.0 = Debug|Win32
2092+ {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.ActiveCfg = Release|Win32
2093+ {4D9FDFB5-986A-4139-823C-F4EE0ED481A1}.Release.Build.0 = Release|Win32
2094+ {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.ActiveCfg = Debug|Win32
2095+ {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Debug.Build.0 = Debug|Win32
2096+ {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.ActiveCfg = Release|Win32
2097+ {24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}.Release.Build.0 = Release|Win32
2098+ EndGlobalSection
2099+ GlobalSection(ExtensibilityGlobals) = postSolution
2100+ EndGlobalSection
2101+ GlobalSection(ExtensibilityAddIns) = postSolution
2102+ EndGlobalSection
2103+EndGlobal
2104+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.sln
2105diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj
2106index a8373ce..2aa6a80 100644
2107--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj
2108+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj
2109@@ -1,3 +1,4 @@
2110+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj
2111 <?xml version="1.0" encoding="Windows-1252"?>
2112 <VisualStudioProject
2113 ProjectType="Visual C++"
2114@@ -124,3 +125,131 @@
2115 <Globals>
2116 </Globals>
2117 </VisualStudioProject>
2118+=======
2119+<?xml version="1.0" encoding="Windows-1252"?>
2120+<VisualStudioProject
2121+ ProjectType="Visual C++"
2122+ Version="7.10"
2123+ Name="gtest"
2124+ ProjectGUID="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
2125+ Keyword="Win32Proj">
2126+ <Platforms>
2127+ <Platform
2128+ Name="Win32"/>
2129+ </Platforms>
2130+ <Configurations>
2131+ <Configuration
2132+ Name="Debug|Win32"
2133+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2134+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2135+ ConfigurationType="4"
2136+ CharacterSet="2"
2137+ ReferencesPath="">
2138+ <Tool
2139+ Name="VCCLCompilerTool"
2140+ Optimization="0"
2141+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
2142+ MinimalRebuild="TRUE"
2143+ BasicRuntimeChecks="3"
2144+ RuntimeLibrary="5"
2145+ UsePrecompiledHeader="0"
2146+ WarningLevel="3"
2147+ Detect64BitPortabilityProblems="FALSE"
2148+ DebugInformationFormat="4"/>
2149+ <Tool
2150+ Name="VCCustomBuildTool"/>
2151+ <Tool
2152+ Name="VCLibrarianTool"
2153+ OutputFile="$(OutDir)/gtestd.lib"/>
2154+ <Tool
2155+ Name="VCMIDLTool"/>
2156+ <Tool
2157+ Name="VCPostBuildEventTool"/>
2158+ <Tool
2159+ Name="VCPreBuildEventTool"/>
2160+ <Tool
2161+ Name="VCPreLinkEventTool"/>
2162+ <Tool
2163+ Name="VCResourceCompilerTool"/>
2164+ <Tool
2165+ Name="VCWebServiceProxyGeneratorTool"/>
2166+ <Tool
2167+ Name="VCXMLDataGeneratorTool"/>
2168+ <Tool
2169+ Name="VCManagedWrapperGeneratorTool"/>
2170+ <Tool
2171+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2172+ </Configuration>
2173+ <Configuration
2174+ Name="Release|Win32"
2175+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2176+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2177+ ConfigurationType="4"
2178+ CharacterSet="2"
2179+ ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
2180+ <Tool
2181+ Name="VCCLCompilerTool"
2182+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
2183+ RuntimeLibrary="4"
2184+ UsePrecompiledHeader="0"
2185+ WarningLevel="3"
2186+ Detect64BitPortabilityProblems="FALSE"
2187+ DebugInformationFormat="3"/>
2188+ <Tool
2189+ Name="VCCustomBuildTool"/>
2190+ <Tool
2191+ Name="VCLibrarianTool"
2192+ OutputFile="$(OutDir)/gtest.lib"/>
2193+ <Tool
2194+ Name="VCMIDLTool"/>
2195+ <Tool
2196+ Name="VCPostBuildEventTool"/>
2197+ <Tool
2198+ Name="VCPreBuildEventTool"/>
2199+ <Tool
2200+ Name="VCPreLinkEventTool"/>
2201+ <Tool
2202+ Name="VCResourceCompilerTool"/>
2203+ <Tool
2204+ Name="VCWebServiceProxyGeneratorTool"/>
2205+ <Tool
2206+ Name="VCXMLDataGeneratorTool"/>
2207+ <Tool
2208+ Name="VCManagedWrapperGeneratorTool"/>
2209+ <Tool
2210+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2211+ </Configuration>
2212+ </Configurations>
2213+ <References>
2214+ </References>
2215+ <Files>
2216+ <Filter
2217+ Name="Source Files"
2218+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
2219+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
2220+ <File
2221+ RelativePath="..\src\gtest-all.cc">
2222+ <FileConfiguration
2223+ Name="Debug|Win32">
2224+ <Tool
2225+ Name="VCCLCompilerTool"
2226+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
2227+ </FileConfiguration>
2228+ <FileConfiguration
2229+ Name="Release|Win32">
2230+ <Tool
2231+ Name="VCCLCompilerTool"
2232+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
2233+ </FileConfiguration>
2234+ </File>
2235+ </Filter>
2236+ <Filter
2237+ Name="Header Files"
2238+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
2239+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
2240+ </Filter>
2241+ </Files>
2242+ <Globals>
2243+ </Globals>
2244+</VisualStudioProject>
2245+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest.vcproj
2246diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj
2247index b5379fe..015ae6c 100644
2248--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj
2249+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj
2250@@ -1,3 +1,4 @@
2251+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj
2252 <?xml version="1.0" encoding="Windows-1252"?>
2253 <VisualStudioProject
2254 ProjectType="Visual C++"
2255@@ -127,3 +128,134 @@
2256 <Globals>
2257 </Globals>
2258 </VisualStudioProject>
2259+=======
2260+<?xml version="1.0" encoding="Windows-1252"?>
2261+<VisualStudioProject
2262+ ProjectType="Visual C++"
2263+ Version="7.10"
2264+ Name="gtest_main-md"
2265+ ProjectGUID="{3AF54C8A-10BF-4332-9147-F68ED9862033}"
2266+ Keyword="Win32Proj">
2267+ <Platforms>
2268+ <Platform
2269+ Name="Win32"/>
2270+ </Platforms>
2271+ <Configurations>
2272+ <Configuration
2273+ Name="Debug|Win32"
2274+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2275+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2276+ ConfigurationType="4"
2277+ CharacterSet="2"
2278+ ReferencesPath="">
2279+ <Tool
2280+ Name="VCCLCompilerTool"
2281+ Optimization="0"
2282+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
2283+ MinimalRebuild="TRUE"
2284+ BasicRuntimeChecks="3"
2285+ RuntimeLibrary="3"
2286+ UsePrecompiledHeader="0"
2287+ WarningLevel="3"
2288+ Detect64BitPortabilityProblems="FALSE"
2289+ DebugInformationFormat="4"/>
2290+ <Tool
2291+ Name="VCCustomBuildTool"/>
2292+ <Tool
2293+ Name="VCLibrarianTool"
2294+ OutputFile="$(OutDir)/$(ProjectName)d.lib"/>
2295+ <Tool
2296+ Name="VCMIDLTool"/>
2297+ <Tool
2298+ Name="VCPostBuildEventTool"/>
2299+ <Tool
2300+ Name="VCPreBuildEventTool"/>
2301+ <Tool
2302+ Name="VCPreLinkEventTool"/>
2303+ <Tool
2304+ Name="VCResourceCompilerTool"/>
2305+ <Tool
2306+ Name="VCWebServiceProxyGeneratorTool"/>
2307+ <Tool
2308+ Name="VCXMLDataGeneratorTool"/>
2309+ <Tool
2310+ Name="VCManagedWrapperGeneratorTool"/>
2311+ <Tool
2312+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2313+ </Configuration>
2314+ <Configuration
2315+ Name="Release|Win32"
2316+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2317+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2318+ ConfigurationType="4"
2319+ CharacterSet="2"
2320+ ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
2321+ <Tool
2322+ Name="VCCLCompilerTool"
2323+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
2324+ RuntimeLibrary="2"
2325+ UsePrecompiledHeader="0"
2326+ WarningLevel="3"
2327+ Detect64BitPortabilityProblems="FALSE"
2328+ DebugInformationFormat="3"/>
2329+ <Tool
2330+ Name="VCCustomBuildTool"/>
2331+ <Tool
2332+ Name="VCLibrarianTool"
2333+ OutputFile="$(OutDir)/$(ProjectName).lib"/>
2334+ <Tool
2335+ Name="VCMIDLTool"/>
2336+ <Tool
2337+ Name="VCPostBuildEventTool"/>
2338+ <Tool
2339+ Name="VCPreBuildEventTool"/>
2340+ <Tool
2341+ Name="VCPreLinkEventTool"/>
2342+ <Tool
2343+ Name="VCResourceCompilerTool"/>
2344+ <Tool
2345+ Name="VCWebServiceProxyGeneratorTool"/>
2346+ <Tool
2347+ Name="VCXMLDataGeneratorTool"/>
2348+ <Tool
2349+ Name="VCManagedWrapperGeneratorTool"/>
2350+ <Tool
2351+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2352+ </Configuration>
2353+ </Configurations>
2354+ <References>
2355+ <ProjectReference
2356+ ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}"
2357+ Name="gtest-md"/>
2358+ </References>
2359+ <Files>
2360+ <Filter
2361+ Name="Source Files"
2362+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
2363+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
2364+ <File
2365+ RelativePath="..\src\gtest_main.cc">
2366+ <FileConfiguration
2367+ Name="Debug|Win32">
2368+ <Tool
2369+ Name="VCCLCompilerTool"
2370+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
2371+ </FileConfiguration>
2372+ <FileConfiguration
2373+ Name="Release|Win32">
2374+ <Tool
2375+ Name="VCCLCompilerTool"
2376+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
2377+ </FileConfiguration>
2378+ </File>
2379+ </Filter>
2380+ <Filter
2381+ Name="Header Files"
2382+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
2383+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
2384+ </Filter>
2385+ </Files>
2386+ <Globals>
2387+ </Globals>
2388+</VisualStudioProject>
2389+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main-md.vcproj
2390diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj
2391index e8b763c..a634bf6 100644
2392--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj
2393+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj
2394@@ -1,3 +1,4 @@
2395+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj
2396 <?xml version="1.0" encoding="Windows-1252"?>
2397 <VisualStudioProject
2398 ProjectType="Visual C++"
2399@@ -127,3 +128,134 @@
2400 <Globals>
2401 </Globals>
2402 </VisualStudioProject>
2403+=======
2404+<?xml version="1.0" encoding="Windows-1252"?>
2405+<VisualStudioProject
2406+ ProjectType="Visual C++"
2407+ Version="7.10"
2408+ Name="gtest_main"
2409+ ProjectGUID="{3AF54C8A-10BF-4332-9147-F68ED9862032}"
2410+ Keyword="Win32Proj">
2411+ <Platforms>
2412+ <Platform
2413+ Name="Win32"/>
2414+ </Platforms>
2415+ <Configurations>
2416+ <Configuration
2417+ Name="Debug|Win32"
2418+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2419+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2420+ ConfigurationType="4"
2421+ CharacterSet="2"
2422+ ReferencesPath="">
2423+ <Tool
2424+ Name="VCCLCompilerTool"
2425+ Optimization="0"
2426+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
2427+ MinimalRebuild="TRUE"
2428+ BasicRuntimeChecks="3"
2429+ RuntimeLibrary="5"
2430+ UsePrecompiledHeader="0"
2431+ WarningLevel="3"
2432+ Detect64BitPortabilityProblems="FALSE"
2433+ DebugInformationFormat="4"/>
2434+ <Tool
2435+ Name="VCCustomBuildTool"/>
2436+ <Tool
2437+ Name="VCLibrarianTool"
2438+ OutputFile="$(OutDir)/$(ProjectName)d.lib"/>
2439+ <Tool
2440+ Name="VCMIDLTool"/>
2441+ <Tool
2442+ Name="VCPostBuildEventTool"/>
2443+ <Tool
2444+ Name="VCPreBuildEventTool"/>
2445+ <Tool
2446+ Name="VCPreLinkEventTool"/>
2447+ <Tool
2448+ Name="VCResourceCompilerTool"/>
2449+ <Tool
2450+ Name="VCWebServiceProxyGeneratorTool"/>
2451+ <Tool
2452+ Name="VCXMLDataGeneratorTool"/>
2453+ <Tool
2454+ Name="VCManagedWrapperGeneratorTool"/>
2455+ <Tool
2456+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2457+ </Configuration>
2458+ <Configuration
2459+ Name="Release|Win32"
2460+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2461+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2462+ ConfigurationType="4"
2463+ CharacterSet="2"
2464+ ReferencesPath="&quot;..\include&quot;;&quot;..&quot;">
2465+ <Tool
2466+ Name="VCCLCompilerTool"
2467+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
2468+ RuntimeLibrary="4"
2469+ UsePrecompiledHeader="0"
2470+ WarningLevel="3"
2471+ Detect64BitPortabilityProblems="FALSE"
2472+ DebugInformationFormat="3"/>
2473+ <Tool
2474+ Name="VCCustomBuildTool"/>
2475+ <Tool
2476+ Name="VCLibrarianTool"
2477+ OutputFile="$(OutDir)/$(ProjectName).lib"/>
2478+ <Tool
2479+ Name="VCMIDLTool"/>
2480+ <Tool
2481+ Name="VCPostBuildEventTool"/>
2482+ <Tool
2483+ Name="VCPreBuildEventTool"/>
2484+ <Tool
2485+ Name="VCPreLinkEventTool"/>
2486+ <Tool
2487+ Name="VCResourceCompilerTool"/>
2488+ <Tool
2489+ Name="VCWebServiceProxyGeneratorTool"/>
2490+ <Tool
2491+ Name="VCXMLDataGeneratorTool"/>
2492+ <Tool
2493+ Name="VCManagedWrapperGeneratorTool"/>
2494+ <Tool
2495+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2496+ </Configuration>
2497+ </Configurations>
2498+ <References>
2499+ <ProjectReference
2500+ ReferencedProjectIdentifier="{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7}"
2501+ Name="gtest"/>
2502+ </References>
2503+ <Files>
2504+ <Filter
2505+ Name="Source Files"
2506+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
2507+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
2508+ <File
2509+ RelativePath="..\src\gtest_main.cc">
2510+ <FileConfiguration
2511+ Name="Debug|Win32">
2512+ <Tool
2513+ Name="VCCLCompilerTool"
2514+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
2515+ </FileConfiguration>
2516+ <FileConfiguration
2517+ Name="Release|Win32">
2518+ <Tool
2519+ Name="VCCLCompilerTool"
2520+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"/>
2521+ </FileConfiguration>
2522+ </File>
2523+ </Filter>
2524+ <Filter
2525+ Name="Header Files"
2526+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
2527+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
2528+ </Filter>
2529+ </Files>
2530+ <Globals>
2531+ </Globals>
2532+</VisualStudioProject>
2533+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_main.vcproj
2534diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj
2535index 05b05d9..60ff8c5 100644
2536--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj
2537+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj
2538@@ -1,3 +1,4 @@
2539+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj
2540 <?xml version="1.0" encoding="Windows-1252"?>
2541 <VisualStudioProject
2542 ProjectType="Visual C++"
2543@@ -162,3 +163,169 @@
2544 <Globals>
2545 </Globals>
2546 </VisualStudioProject>
2547+=======
2548+<?xml version="1.0" encoding="Windows-1252"?>
2549+<VisualStudioProject
2550+ ProjectType="Visual C++"
2551+ Version="7.10"
2552+ Name="gtest_prod_test-md"
2553+ ProjectGUID="{24848551-EF4F-47E8-9A9D-EA4D49BC3ECB}"
2554+ Keyword="Win32Proj">
2555+ <Platforms>
2556+ <Platform
2557+ Name="Win32"/>
2558+ </Platforms>
2559+ <Configurations>
2560+ <Configuration
2561+ Name="Debug|Win32"
2562+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2563+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2564+ ConfigurationType="1"
2565+ CharacterSet="2">
2566+ <Tool
2567+ Name="VCCLCompilerTool"
2568+ Optimization="0"
2569+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
2570+ MinimalRebuild="TRUE"
2571+ BasicRuntimeChecks="3"
2572+ RuntimeLibrary="3"
2573+ UsePrecompiledHeader="3"
2574+ WarningLevel="3"
2575+ Detect64BitPortabilityProblems="FALSE"
2576+ DebugInformationFormat="4"/>
2577+ <Tool
2578+ Name="VCCustomBuildTool"/>
2579+ <Tool
2580+ Name="VCLinkerTool"
2581+ OutputFile="$(OutDir)/gtest_prod_test.exe"
2582+ LinkIncremental="2"
2583+ GenerateDebugInformation="TRUE"
2584+ ProgramDatabaseFile="$(OutDir)/gtest_prod_test.pdb"
2585+ SubSystem="1"
2586+ TargetMachine="1"/>
2587+ <Tool
2588+ Name="VCMIDLTool"/>
2589+ <Tool
2590+ Name="VCPostBuildEventTool"/>
2591+ <Tool
2592+ Name="VCPreBuildEventTool"/>
2593+ <Tool
2594+ Name="VCPreLinkEventTool"/>
2595+ <Tool
2596+ Name="VCResourceCompilerTool"/>
2597+ <Tool
2598+ Name="VCWebServiceProxyGeneratorTool"/>
2599+ <Tool
2600+ Name="VCXMLDataGeneratorTool"/>
2601+ <Tool
2602+ Name="VCWebDeploymentTool"/>
2603+ <Tool
2604+ Name="VCManagedWrapperGeneratorTool"/>
2605+ <Tool
2606+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2607+ </Configuration>
2608+ <Configuration
2609+ Name="Release|Win32"
2610+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2611+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2612+ ConfigurationType="1"
2613+ CharacterSet="2">
2614+ <Tool
2615+ Name="VCCLCompilerTool"
2616+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
2617+ RuntimeLibrary="2"
2618+ UsePrecompiledHeader="3"
2619+ WarningLevel="3"
2620+ Detect64BitPortabilityProblems="FALSE"
2621+ DebugInformationFormat="3"/>
2622+ <Tool
2623+ Name="VCCustomBuildTool"/>
2624+ <Tool
2625+ Name="VCLinkerTool"
2626+ OutputFile="$(OutDir)/gtest_prod_test.exe"
2627+ LinkIncremental="1"
2628+ GenerateDebugInformation="TRUE"
2629+ SubSystem="1"
2630+ OptimizeReferences="2"
2631+ EnableCOMDATFolding="2"
2632+ TargetMachine="1"/>
2633+ <Tool
2634+ Name="VCMIDLTool"/>
2635+ <Tool
2636+ Name="VCPostBuildEventTool"/>
2637+ <Tool
2638+ Name="VCPreBuildEventTool"/>
2639+ <Tool
2640+ Name="VCPreLinkEventTool"/>
2641+ <Tool
2642+ Name="VCResourceCompilerTool"/>
2643+ <Tool
2644+ Name="VCWebServiceProxyGeneratorTool"/>
2645+ <Tool
2646+ Name="VCXMLDataGeneratorTool"/>
2647+ <Tool
2648+ Name="VCWebDeploymentTool"/>
2649+ <Tool
2650+ Name="VCManagedWrapperGeneratorTool"/>
2651+ <Tool
2652+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2653+ </Configuration>
2654+ </Configurations>
2655+ <References>
2656+ <ProjectReference
2657+ ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862033}"
2658+ Name="gtest_main-md"/>
2659+ </References>
2660+ <Files>
2661+ <Filter
2662+ Name="Source Files"
2663+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
2664+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
2665+ <File
2666+ RelativePath="..\test\gtest_prod_test.cc">
2667+ <FileConfiguration
2668+ Name="Debug|Win32">
2669+ <Tool
2670+ Name="VCCLCompilerTool"
2671+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
2672+ UsePrecompiledHeader="0"/>
2673+ </FileConfiguration>
2674+ <FileConfiguration
2675+ Name="Release|Win32">
2676+ <Tool
2677+ Name="VCCLCompilerTool"
2678+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
2679+ UsePrecompiledHeader="0"/>
2680+ </FileConfiguration>
2681+ </File>
2682+ <File
2683+ RelativePath="..\test\production.cc">
2684+ <FileConfiguration
2685+ Name="Debug|Win32">
2686+ <Tool
2687+ Name="VCCLCompilerTool"
2688+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
2689+ UsePrecompiledHeader="0"/>
2690+ </FileConfiguration>
2691+ <FileConfiguration
2692+ Name="Release|Win32">
2693+ <Tool
2694+ Name="VCCLCompilerTool"
2695+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
2696+ UsePrecompiledHeader="0"/>
2697+ </FileConfiguration>
2698+ </File>
2699+ </Filter>
2700+ <Filter
2701+ Name="Header Files"
2702+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
2703+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
2704+ <File
2705+ RelativePath="..\test\production.h">
2706+ </File>
2707+ </Filter>
2708+ </Files>
2709+ <Globals>
2710+ </Globals>
2711+</VisualStudioProject>
2712+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test-md.vcproj
2713diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj
2714index 6d7a2f0..9e8245e 100644
2715--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj
2716+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj
2717@@ -1,3 +1,4 @@
2718+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj
2719 <?xml version="1.0" encoding="Windows-1252"?>
2720 <VisualStudioProject
2721 ProjectType="Visual C++"
2722@@ -162,3 +163,169 @@
2723 <Globals>
2724 </Globals>
2725 </VisualStudioProject>
2726+=======
2727+<?xml version="1.0" encoding="Windows-1252"?>
2728+<VisualStudioProject
2729+ ProjectType="Visual C++"
2730+ Version="7.10"
2731+ Name="gtest_prod_test"
2732+ ProjectGUID="{24848551-EF4F-47E8-9A9D-EA4D49BC3ECA}"
2733+ Keyword="Win32Proj">
2734+ <Platforms>
2735+ <Platform
2736+ Name="Win32"/>
2737+ </Platforms>
2738+ <Configurations>
2739+ <Configuration
2740+ Name="Debug|Win32"
2741+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2742+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2743+ ConfigurationType="1"
2744+ CharacterSet="2">
2745+ <Tool
2746+ Name="VCCLCompilerTool"
2747+ Optimization="0"
2748+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
2749+ MinimalRebuild="TRUE"
2750+ BasicRuntimeChecks="3"
2751+ RuntimeLibrary="5"
2752+ UsePrecompiledHeader="3"
2753+ WarningLevel="3"
2754+ Detect64BitPortabilityProblems="FALSE"
2755+ DebugInformationFormat="4"/>
2756+ <Tool
2757+ Name="VCCustomBuildTool"/>
2758+ <Tool
2759+ Name="VCLinkerTool"
2760+ OutputFile="$(OutDir)/gtest_prod_test.exe"
2761+ LinkIncremental="2"
2762+ GenerateDebugInformation="TRUE"
2763+ ProgramDatabaseFile="$(OutDir)/gtest_prod_test.pdb"
2764+ SubSystem="1"
2765+ TargetMachine="1"/>
2766+ <Tool
2767+ Name="VCMIDLTool"/>
2768+ <Tool
2769+ Name="VCPostBuildEventTool"/>
2770+ <Tool
2771+ Name="VCPreBuildEventTool"/>
2772+ <Tool
2773+ Name="VCPreLinkEventTool"/>
2774+ <Tool
2775+ Name="VCResourceCompilerTool"/>
2776+ <Tool
2777+ Name="VCWebServiceProxyGeneratorTool"/>
2778+ <Tool
2779+ Name="VCXMLDataGeneratorTool"/>
2780+ <Tool
2781+ Name="VCWebDeploymentTool"/>
2782+ <Tool
2783+ Name="VCManagedWrapperGeneratorTool"/>
2784+ <Tool
2785+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2786+ </Configuration>
2787+ <Configuration
2788+ Name="Release|Win32"
2789+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2790+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2791+ ConfigurationType="1"
2792+ CharacterSet="2">
2793+ <Tool
2794+ Name="VCCLCompilerTool"
2795+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
2796+ RuntimeLibrary="4"
2797+ UsePrecompiledHeader="3"
2798+ WarningLevel="3"
2799+ Detect64BitPortabilityProblems="FALSE"
2800+ DebugInformationFormat="3"/>
2801+ <Tool
2802+ Name="VCCustomBuildTool"/>
2803+ <Tool
2804+ Name="VCLinkerTool"
2805+ OutputFile="$(OutDir)/gtest_prod_test.exe"
2806+ LinkIncremental="1"
2807+ GenerateDebugInformation="TRUE"
2808+ SubSystem="1"
2809+ OptimizeReferences="2"
2810+ EnableCOMDATFolding="2"
2811+ TargetMachine="1"/>
2812+ <Tool
2813+ Name="VCMIDLTool"/>
2814+ <Tool
2815+ Name="VCPostBuildEventTool"/>
2816+ <Tool
2817+ Name="VCPreBuildEventTool"/>
2818+ <Tool
2819+ Name="VCPreLinkEventTool"/>
2820+ <Tool
2821+ Name="VCResourceCompilerTool"/>
2822+ <Tool
2823+ Name="VCWebServiceProxyGeneratorTool"/>
2824+ <Tool
2825+ Name="VCXMLDataGeneratorTool"/>
2826+ <Tool
2827+ Name="VCWebDeploymentTool"/>
2828+ <Tool
2829+ Name="VCManagedWrapperGeneratorTool"/>
2830+ <Tool
2831+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2832+ </Configuration>
2833+ </Configurations>
2834+ <References>
2835+ <ProjectReference
2836+ ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862032}"
2837+ Name="gtest_main"/>
2838+ </References>
2839+ <Files>
2840+ <Filter
2841+ Name="Source Files"
2842+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
2843+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
2844+ <File
2845+ RelativePath="..\test\gtest_prod_test.cc">
2846+ <FileConfiguration
2847+ Name="Debug|Win32">
2848+ <Tool
2849+ Name="VCCLCompilerTool"
2850+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
2851+ UsePrecompiledHeader="0"/>
2852+ </FileConfiguration>
2853+ <FileConfiguration
2854+ Name="Release|Win32">
2855+ <Tool
2856+ Name="VCCLCompilerTool"
2857+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
2858+ UsePrecompiledHeader="0"/>
2859+ </FileConfiguration>
2860+ </File>
2861+ <File
2862+ RelativePath="..\test\production.cc">
2863+ <FileConfiguration
2864+ Name="Debug|Win32">
2865+ <Tool
2866+ Name="VCCLCompilerTool"
2867+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
2868+ UsePrecompiledHeader="0"/>
2869+ </FileConfiguration>
2870+ <FileConfiguration
2871+ Name="Release|Win32">
2872+ <Tool
2873+ Name="VCCLCompilerTool"
2874+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
2875+ UsePrecompiledHeader="0"/>
2876+ </FileConfiguration>
2877+ </File>
2878+ </Filter>
2879+ <Filter
2880+ Name="Header Files"
2881+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
2882+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
2883+ <File
2884+ RelativePath="..\test\production.h">
2885+ </File>
2886+ </Filter>
2887+ </Files>
2888+ <Globals>
2889+ </Globals>
2890+</VisualStudioProject>
2891+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_prod_test.vcproj
2892diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj
2893index 38a5e56..ef954cb 100644
2894--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj
2895+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj
2896@@ -1,3 +1,4 @@
2897+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj
2898 <?xml version="1.0" encoding="Windows-1252"?>
2899 <VisualStudioProject
2900 ProjectType="Visual C++"
2901@@ -145,3 +146,152 @@
2902 <Globals>
2903 </Globals>
2904 </VisualStudioProject>
2905+=======
2906+<?xml version="1.0" encoding="Windows-1252"?>
2907+<VisualStudioProject
2908+ ProjectType="Visual C++"
2909+ Version="7.10"
2910+ Name="gtest_unittest-md"
2911+ ProjectGUID="{4D9FDFB5-986A-4139-823C-F4EE0ED481A2}"
2912+ Keyword="Win32Proj">
2913+ <Platforms>
2914+ <Platform
2915+ Name="Win32"/>
2916+ </Platforms>
2917+ <Configurations>
2918+ <Configuration
2919+ Name="Debug|Win32"
2920+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2921+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2922+ ConfigurationType="1"
2923+ CharacterSet="2">
2924+ <Tool
2925+ Name="VCCLCompilerTool"
2926+ Optimization="0"
2927+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
2928+ MinimalRebuild="TRUE"
2929+ BasicRuntimeChecks="3"
2930+ RuntimeLibrary="3"
2931+ UsePrecompiledHeader="3"
2932+ WarningLevel="3"
2933+ Detect64BitPortabilityProblems="FALSE"
2934+ DebugInformationFormat="4"/>
2935+ <Tool
2936+ Name="VCCustomBuildTool"/>
2937+ <Tool
2938+ Name="VCLinkerTool"
2939+ OutputFile="$(OutDir)/gtest_unittest.exe"
2940+ LinkIncremental="2"
2941+ GenerateDebugInformation="TRUE"
2942+ ProgramDatabaseFile="$(OutDir)/gtest_unittest.pdb"
2943+ SubSystem="1"
2944+ TargetMachine="1"/>
2945+ <Tool
2946+ Name="VCMIDLTool"/>
2947+ <Tool
2948+ Name="VCPostBuildEventTool"/>
2949+ <Tool
2950+ Name="VCPreBuildEventTool"/>
2951+ <Tool
2952+ Name="VCPreLinkEventTool"/>
2953+ <Tool
2954+ Name="VCResourceCompilerTool"/>
2955+ <Tool
2956+ Name="VCWebServiceProxyGeneratorTool"/>
2957+ <Tool
2958+ Name="VCXMLDataGeneratorTool"/>
2959+ <Tool
2960+ Name="VCWebDeploymentTool"/>
2961+ <Tool
2962+ Name="VCManagedWrapperGeneratorTool"/>
2963+ <Tool
2964+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
2965+ </Configuration>
2966+ <Configuration
2967+ Name="Release|Win32"
2968+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
2969+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
2970+ ConfigurationType="1"
2971+ CharacterSet="2">
2972+ <Tool
2973+ Name="VCCLCompilerTool"
2974+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
2975+ RuntimeLibrary="2"
2976+ UsePrecompiledHeader="3"
2977+ WarningLevel="3"
2978+ Detect64BitPortabilityProblems="FALSE"
2979+ DebugInformationFormat="3"/>
2980+ <Tool
2981+ Name="VCCustomBuildTool"/>
2982+ <Tool
2983+ Name="VCLinkerTool"
2984+ OutputFile="$(OutDir)/gtest_unittest.exe"
2985+ LinkIncremental="1"
2986+ GenerateDebugInformation="TRUE"
2987+ SubSystem="1"
2988+ OptimizeReferences="2"
2989+ EnableCOMDATFolding="2"
2990+ TargetMachine="1"/>
2991+ <Tool
2992+ Name="VCMIDLTool"/>
2993+ <Tool
2994+ Name="VCPostBuildEventTool"/>
2995+ <Tool
2996+ Name="VCPreBuildEventTool"/>
2997+ <Tool
2998+ Name="VCPreLinkEventTool"/>
2999+ <Tool
3000+ Name="VCResourceCompilerTool"/>
3001+ <Tool
3002+ Name="VCWebServiceProxyGeneratorTool"/>
3003+ <Tool
3004+ Name="VCXMLDataGeneratorTool"/>
3005+ <Tool
3006+ Name="VCWebDeploymentTool"/>
3007+ <Tool
3008+ Name="VCManagedWrapperGeneratorTool"/>
3009+ <Tool
3010+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
3011+ </Configuration>
3012+ </Configurations>
3013+ <References>
3014+ <ProjectReference
3015+ ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862033}"
3016+ Name="gtest_main-md"/>
3017+ </References>
3018+ <Files>
3019+ <Filter
3020+ Name="Source Files"
3021+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
3022+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
3023+ <File
3024+ RelativePath="..\test\gtest_unittest.cc">
3025+ <FileConfiguration
3026+ Name="Debug|Win32">
3027+ <Tool
3028+ Name="VCCLCompilerTool"
3029+ Optimization="1"
3030+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
3031+ BasicRuntimeChecks="0"
3032+ UsePrecompiledHeader="0"
3033+ DebugInformationFormat="3"/>
3034+ </FileConfiguration>
3035+ <FileConfiguration
3036+ Name="Release|Win32">
3037+ <Tool
3038+ Name="VCCLCompilerTool"
3039+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
3040+ UsePrecompiledHeader="0"/>
3041+ </FileConfiguration>
3042+ </File>
3043+ </Filter>
3044+ <Filter
3045+ Name="Header Files"
3046+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
3047+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
3048+ </Filter>
3049+ </Files>
3050+ <Globals>
3051+ </Globals>
3052+</VisualStudioProject>
3053+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest-md.vcproj
3054diff --git a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj
3055index cb1f52b..40fc208 100644
3056--- a/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj
3057+++ b/src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj
3058@@ -1,3 +1,4 @@
3059+<<<<<<< src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj
3060 <?xml version="1.0" encoding="Windows-1252"?>
3061 <VisualStudioProject
3062 ProjectType="Visual C++"
3063@@ -145,3 +146,152 @@
3064 <Globals>
3065 </Globals>
3066 </VisualStudioProject>
3067+=======
3068+<?xml version="1.0" encoding="Windows-1252"?>
3069+<VisualStudioProject
3070+ ProjectType="Visual C++"
3071+ Version="7.10"
3072+ Name="gtest_unittest"
3073+ ProjectGUID="{4D9FDFB5-986A-4139-823C-F4EE0ED481A1}"
3074+ Keyword="Win32Proj">
3075+ <Platforms>
3076+ <Platform
3077+ Name="Win32"/>
3078+ </Platforms>
3079+ <Configurations>
3080+ <Configuration
3081+ Name="Debug|Win32"
3082+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
3083+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
3084+ ConfigurationType="1"
3085+ CharacterSet="2">
3086+ <Tool
3087+ Name="VCCLCompilerTool"
3088+ Optimization="0"
3089+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
3090+ MinimalRebuild="TRUE"
3091+ BasicRuntimeChecks="3"
3092+ RuntimeLibrary="5"
3093+ UsePrecompiledHeader="3"
3094+ WarningLevel="3"
3095+ Detect64BitPortabilityProblems="FALSE"
3096+ DebugInformationFormat="4"/>
3097+ <Tool
3098+ Name="VCCustomBuildTool"/>
3099+ <Tool
3100+ Name="VCLinkerTool"
3101+ OutputFile="$(OutDir)/gtest_unittest.exe"
3102+ LinkIncremental="2"
3103+ GenerateDebugInformation="TRUE"
3104+ ProgramDatabaseFile="$(OutDir)/gtest_unittest.pdb"
3105+ SubSystem="1"
3106+ TargetMachine="1"/>
3107+ <Tool
3108+ Name="VCMIDLTool"/>
3109+ <Tool
3110+ Name="VCPostBuildEventTool"/>
3111+ <Tool
3112+ Name="VCPreBuildEventTool"/>
3113+ <Tool
3114+ Name="VCPreLinkEventTool"/>
3115+ <Tool
3116+ Name="VCResourceCompilerTool"/>
3117+ <Tool
3118+ Name="VCWebServiceProxyGeneratorTool"/>
3119+ <Tool
3120+ Name="VCXMLDataGeneratorTool"/>
3121+ <Tool
3122+ Name="VCWebDeploymentTool"/>
3123+ <Tool
3124+ Name="VCManagedWrapperGeneratorTool"/>
3125+ <Tool
3126+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
3127+ </Configuration>
3128+ <Configuration
3129+ Name="Release|Win32"
3130+ OutputDirectory="$(SolutionName)/$(ConfigurationName)"
3131+ IntermediateDirectory="$(OutDir)/$(ProjectName)"
3132+ ConfigurationType="1"
3133+ CharacterSet="2">
3134+ <Tool
3135+ Name="VCCLCompilerTool"
3136+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
3137+ RuntimeLibrary="4"
3138+ UsePrecompiledHeader="3"
3139+ WarningLevel="3"
3140+ Detect64BitPortabilityProblems="FALSE"
3141+ DebugInformationFormat="3"/>
3142+ <Tool
3143+ Name="VCCustomBuildTool"/>
3144+ <Tool
3145+ Name="VCLinkerTool"
3146+ OutputFile="$(OutDir)/gtest_unittest.exe"
3147+ LinkIncremental="1"
3148+ GenerateDebugInformation="TRUE"
3149+ SubSystem="1"
3150+ OptimizeReferences="2"
3151+ EnableCOMDATFolding="2"
3152+ TargetMachine="1"/>
3153+ <Tool
3154+ Name="VCMIDLTool"/>
3155+ <Tool
3156+ Name="VCPostBuildEventTool"/>
3157+ <Tool
3158+ Name="VCPreBuildEventTool"/>
3159+ <Tool
3160+ Name="VCPreLinkEventTool"/>
3161+ <Tool
3162+ Name="VCResourceCompilerTool"/>
3163+ <Tool
3164+ Name="VCWebServiceProxyGeneratorTool"/>
3165+ <Tool
3166+ Name="VCXMLDataGeneratorTool"/>
3167+ <Tool
3168+ Name="VCWebDeploymentTool"/>
3169+ <Tool
3170+ Name="VCManagedWrapperGeneratorTool"/>
3171+ <Tool
3172+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
3173+ </Configuration>
3174+ </Configurations>
3175+ <References>
3176+ <ProjectReference
3177+ ReferencedProjectIdentifier="{3AF54C8A-10BF-4332-9147-F68ED9862032}"
3178+ Name="gtest_main"/>
3179+ </References>
3180+ <Files>
3181+ <Filter
3182+ Name="Source Files"
3183+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
3184+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
3185+ <File
3186+ RelativePath="..\test\gtest_unittest.cc">
3187+ <FileConfiguration
3188+ Name="Debug|Win32">
3189+ <Tool
3190+ Name="VCCLCompilerTool"
3191+ Optimization="1"
3192+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
3193+ BasicRuntimeChecks="0"
3194+ UsePrecompiledHeader="0"
3195+ DebugInformationFormat="3"/>
3196+ </FileConfiguration>
3197+ <FileConfiguration
3198+ Name="Release|Win32">
3199+ <Tool
3200+ Name="VCCLCompilerTool"
3201+ AdditionalIncludeDirectories="&quot;..&quot;;&quot;..\include&quot;"
3202+ UsePrecompiledHeader="0"/>
3203+ </FileConfiguration>
3204+ </File>
3205+ </Filter>
3206+ <Filter
3207+ Name="Header Files"
3208+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
3209+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
3210+ </Filter>
3211+ </Files>
3212+ <Globals>
3213+ </Globals>
3214+</VisualStudioProject>
3215+>>>>>>> src/rapidjson/thirdparty/gtest/googletest/msvc/gtest_unittest.vcproj
3216diff --git a/src/zstd/build/VS2008/fullbench/fullbench.vcproj b/src/zstd/build/VS2008/fullbench/fullbench.vcproj
3217index 60a73c8..4d57cfd 100644
3218--- a/src/zstd/build/VS2008/fullbench/fullbench.vcproj
3219+++ b/src/zstd/build/VS2008/fullbench/fullbench.vcproj
3220@@ -1,3 +1,4 @@
3221+<<<<<<< src/zstd/build/VS2008/fullbench/fullbench.vcproj
3222 <?xml version="1.0" encoding="Windows-1252"?>
3223 <VisualStudioProject
3224 ProjectType="Visual C++"
3225@@ -547,3 +548,554 @@
3226 <Globals>
3227 </Globals>
3228 </VisualStudioProject>
3229+=======
3230+<?xml version="1.0" encoding="Windows-1252"?>
3231+<VisualStudioProject
3232+ ProjectType="Visual C++"
3233+ Version="9.00"
3234+ Name="fullbench"
3235+ ProjectGUID="{CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}"
3236+ RootNamespace="fullbench"
3237+ Keyword="Win32Proj"
3238+ TargetFrameworkVersion="196613"
3239+ >
3240+ <Platforms>
3241+ <Platform
3242+ Name="Win32"
3243+ />
3244+ <Platform
3245+ Name="x64"
3246+ />
3247+ </Platforms>
3248+ <ToolFiles>
3249+ </ToolFiles>
3250+ <Configurations>
3251+ <Configuration
3252+ Name="Debug|Win32"
3253+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
3254+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
3255+ ConfigurationType="1"
3256+ CharacterSet="2"
3257+ >
3258+ <Tool
3259+ Name="VCPreBuildEventTool"
3260+ />
3261+ <Tool
3262+ Name="VCCustomBuildTool"
3263+ />
3264+ <Tool
3265+ Name="VCXMLDataGeneratorTool"
3266+ />
3267+ <Tool
3268+ Name="VCWebServiceProxyGeneratorTool"
3269+ />
3270+ <Tool
3271+ Name="VCMIDLTool"
3272+ />
3273+ <Tool
3274+ Name="VCCLCompilerTool"
3275+ Optimization="0"
3276+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\programs\legacy"
3277+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
3278+ MinimalRebuild="true"
3279+ BasicRuntimeChecks="3"
3280+ RuntimeLibrary="3"
3281+ UsePrecompiledHeader="0"
3282+ WarningLevel="4"
3283+ WarnAsError="true"
3284+ DebugInformationFormat="4"
3285+ />
3286+ <Tool
3287+ Name="VCManagedResourceCompilerTool"
3288+ />
3289+ <Tool
3290+ Name="VCResourceCompilerTool"
3291+ />
3292+ <Tool
3293+ Name="VCPreLinkEventTool"
3294+ />
3295+ <Tool
3296+ Name="VCLinkerTool"
3297+ LinkIncremental="2"
3298+ GenerateDebugInformation="true"
3299+ SubSystem="1"
3300+ TargetMachine="1"
3301+ />
3302+ <Tool
3303+ Name="VCALinkTool"
3304+ />
3305+ <Tool
3306+ Name="VCManifestTool"
3307+ />
3308+ <Tool
3309+ Name="VCXDCMakeTool"
3310+ />
3311+ <Tool
3312+ Name="VCBscMakeTool"
3313+ />
3314+ <Tool
3315+ Name="VCFxCopTool"
3316+ />
3317+ <Tool
3318+ Name="VCAppVerifierTool"
3319+ />
3320+ <Tool
3321+ Name="VCPostBuildEventTool"
3322+ />
3323+ </Configuration>
3324+ <Configuration
3325+ Name="Release|Win32"
3326+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
3327+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
3328+ ConfigurationType="1"
3329+ CharacterSet="2"
3330+ WholeProgramOptimization="1"
3331+ >
3332+ <Tool
3333+ Name="VCPreBuildEventTool"
3334+ />
3335+ <Tool
3336+ Name="VCCustomBuildTool"
3337+ />
3338+ <Tool
3339+ Name="VCXMLDataGeneratorTool"
3340+ />
3341+ <Tool
3342+ Name="VCWebServiceProxyGeneratorTool"
3343+ />
3344+ <Tool
3345+ Name="VCMIDLTool"
3346+ />
3347+ <Tool
3348+ Name="VCCLCompilerTool"
3349+ Optimization="2"
3350+ EnableIntrinsicFunctions="true"
3351+ OmitFramePointers="true"
3352+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\programs\legacy"
3353+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
3354+ RuntimeLibrary="0"
3355+ EnableFunctionLevelLinking="true"
3356+ UsePrecompiledHeader="0"
3357+ WarningLevel="4"
3358+ DebugInformationFormat="3"
3359+ />
3360+ <Tool
3361+ Name="VCManagedResourceCompilerTool"
3362+ />
3363+ <Tool
3364+ Name="VCResourceCompilerTool"
3365+ />
3366+ <Tool
3367+ Name="VCPreLinkEventTool"
3368+ />
3369+ <Tool
3370+ Name="VCLinkerTool"
3371+ LinkIncremental="1"
3372+ GenerateDebugInformation="true"
3373+ SubSystem="1"
3374+ OptimizeReferences="2"
3375+ EnableCOMDATFolding="2"
3376+ TargetMachine="1"
3377+ />
3378+ <Tool
3379+ Name="VCALinkTool"
3380+ />
3381+ <Tool
3382+ Name="VCManifestTool"
3383+ />
3384+ <Tool
3385+ Name="VCXDCMakeTool"
3386+ />
3387+ <Tool
3388+ Name="VCBscMakeTool"
3389+ />
3390+ <Tool
3391+ Name="VCFxCopTool"
3392+ />
3393+ <Tool
3394+ Name="VCAppVerifierTool"
3395+ />
3396+ <Tool
3397+ Name="VCPostBuildEventTool"
3398+ />
3399+ </Configuration>
3400+ <Configuration
3401+ Name="Debug|x64"
3402+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
3403+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
3404+ ConfigurationType="1"
3405+ CharacterSet="2"
3406+ >
3407+ <Tool
3408+ Name="VCPreBuildEventTool"
3409+ />
3410+ <Tool
3411+ Name="VCCustomBuildTool"
3412+ />
3413+ <Tool
3414+ Name="VCXMLDataGeneratorTool"
3415+ />
3416+ <Tool
3417+ Name="VCWebServiceProxyGeneratorTool"
3418+ />
3419+ <Tool
3420+ Name="VCMIDLTool"
3421+ TargetEnvironment="3"
3422+ />
3423+ <Tool
3424+ Name="VCCLCompilerTool"
3425+ Optimization="0"
3426+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\programs\legacy"
3427+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
3428+ MinimalRebuild="true"
3429+ BasicRuntimeChecks="3"
3430+ RuntimeLibrary="3"
3431+ UsePrecompiledHeader="0"
3432+ WarningLevel="4"
3433+ WarnAsError="true"
3434+ DebugInformationFormat="3"
3435+ />
3436+ <Tool
3437+ Name="VCManagedResourceCompilerTool"
3438+ />
3439+ <Tool
3440+ Name="VCResourceCompilerTool"
3441+ />
3442+ <Tool
3443+ Name="VCPreLinkEventTool"
3444+ />
3445+ <Tool
3446+ Name="VCLinkerTool"
3447+ LinkIncremental="2"
3448+ GenerateDebugInformation="true"
3449+ SubSystem="1"
3450+ TargetMachine="17"
3451+ />
3452+ <Tool
3453+ Name="VCALinkTool"
3454+ />
3455+ <Tool
3456+ Name="VCManifestTool"
3457+ />
3458+ <Tool
3459+ Name="VCXDCMakeTool"
3460+ />
3461+ <Tool
3462+ Name="VCBscMakeTool"
3463+ />
3464+ <Tool
3465+ Name="VCFxCopTool"
3466+ />
3467+ <Tool
3468+ Name="VCAppVerifierTool"
3469+ />
3470+ <Tool
3471+ Name="VCPostBuildEventTool"
3472+ />
3473+ </Configuration>
3474+ <Configuration
3475+ Name="Release|x64"
3476+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
3477+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
3478+ ConfigurationType="1"
3479+ CharacterSet="2"
3480+ WholeProgramOptimization="1"
3481+ >
3482+ <Tool
3483+ Name="VCPreBuildEventTool"
3484+ />
3485+ <Tool
3486+ Name="VCCustomBuildTool"
3487+ />
3488+ <Tool
3489+ Name="VCXMLDataGeneratorTool"
3490+ />
3491+ <Tool
3492+ Name="VCWebServiceProxyGeneratorTool"
3493+ />
3494+ <Tool
3495+ Name="VCMIDLTool"
3496+ TargetEnvironment="3"
3497+ />
3498+ <Tool
3499+ Name="VCCLCompilerTool"
3500+ Optimization="2"
3501+ EnableIntrinsicFunctions="true"
3502+ OmitFramePointers="true"
3503+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs;$(SolutionDir)..\..\programs\legacy"
3504+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
3505+ RuntimeLibrary="0"
3506+ EnableFunctionLevelLinking="true"
3507+ UsePrecompiledHeader="0"
3508+ WarningLevel="4"
3509+ DebugInformationFormat="3"
3510+ />
3511+ <Tool
3512+ Name="VCManagedResourceCompilerTool"
3513+ />
3514+ <Tool
3515+ Name="VCResourceCompilerTool"
3516+ />
3517+ <Tool
3518+ Name="VCPreLinkEventTool"
3519+ />
3520+ <Tool
3521+ Name="VCLinkerTool"
3522+ LinkIncremental="1"
3523+ GenerateDebugInformation="true"
3524+ SubSystem="1"
3525+ OptimizeReferences="2"
3526+ EnableCOMDATFolding="2"
3527+ TargetMachine="17"
3528+ />
3529+ <Tool
3530+ Name="VCALinkTool"
3531+ />
3532+ <Tool
3533+ Name="VCManifestTool"
3534+ />
3535+ <Tool
3536+ Name="VCXDCMakeTool"
3537+ />
3538+ <Tool
3539+ Name="VCBscMakeTool"
3540+ />
3541+ <Tool
3542+ Name="VCFxCopTool"
3543+ />
3544+ <Tool
3545+ Name="VCAppVerifierTool"
3546+ />
3547+ <Tool
3548+ Name="VCPostBuildEventTool"
3549+ />
3550+ </Configuration>
3551+ </Configurations>
3552+ <References>
3553+ </References>
3554+ <Files>
3555+ <Filter
3556+ Name="Source Files"
3557+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
3558+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
3559+ >
3560+ <File
3561+ RelativePath="..\..\..\lib\common\entropy_common.c"
3562+ >
3563+ </File>
3564+ <File
3565+ RelativePath="..\..\..\lib\compress\hist.c"
3566+ >
3567+ </File>
3568+ <File
3569+ RelativePath="..\..\..\lib\common\error_private.c"
3570+ >
3571+ </File>
3572+ <File
3573+ RelativePath="..\..\..\lib\common\fse_decompress.c"
3574+ >
3575+ </File>
3576+ <File
3577+ RelativePath="..\..\..\lib\common\xxhash.c"
3578+ >
3579+ </File>
3580+ <File
3581+ RelativePath="..\..\..\lib\common\zstd_common.c"
3582+ >
3583+ </File>
3584+ <File
3585+ RelativePath="..\..\..\lib\common\pool.c"
3586+ >
3587+ </File>
3588+ <File
3589+ RelativePath="..\..\..\lib\common\threading.c"
3590+ >
3591+ </File>
3592+ <File
3593+ RelativePath="..\..\..\lib\compress\zstd_compress.c"
3594+ >
3595+ </File>
3596+ <File
3597+ RelativePath="..\..\..\lib\compress\zstd_compress_literals.c"
3598+ >
3599+ </File>
3600+ <File
3601+ RelativePath="..\..\..\lib\compress\zstd_compress_sequences.c"
3602+ >
3603+ </File>
3604+ <File
3605+ RelativePath="..\..\..\lib\compress\zstd_compress_superblock.c"
3606+ >
3607+ </File>
3608+ <File
3609+ RelativePath="..\..\..\lib\compress\zstdmt_compress.c"
3610+ >
3611+ </File>
3612+ <File
3613+ RelativePath="..\..\..\lib\compress\fse_compress.c"
3614+ >
3615+ </File>
3616+ <File
3617+ RelativePath="..\..\..\lib\compress\huf_compress.c"
3618+ >
3619+ </File>
3620+ <File
3621+ RelativePath="..\..\..\lib\decompress\zstd_decompress.c"
3622+ >
3623+ </File>
3624+ <File
3625+ RelativePath="..\..\..\lib\decompress\zstd_decompress_block.c"
3626+ >
3627+ </File>
3628+ <File
3629+ RelativePath="..\..\..\lib\decompress\zstd_ddict.c"
3630+ >
3631+ </File>
3632+ <File
3633+ RelativePath="..\..\..\lib\decompress\huf_decompress.c"
3634+ >
3635+ </File>
3636+ <File
3637+ RelativePath="..\..\..\programs\datagen.c"
3638+ >
3639+ </File>
3640+ <File
3641+ RelativePath="..\..\..\programs\benchfn.c"
3642+ >
3643+ </File>
3644+ <File
3645+ RelativePath="..\..\..\tests\fullbench.c"
3646+ >
3647+ </File>
3648+ <File
3649+ RelativePath="..\..\..\programs\util.c"
3650+ >
3651+ </File>
3652+ <File
3653+ RelativePath="..\..\..\programs\timefn.c"
3654+ >
3655+ </File>
3656+ <File
3657+ RelativePath="..\..\..\lib\compress\zstd_fast.c"
3658+ >
3659+ </File>
3660+ <File
3661+ RelativePath="..\..\..\lib\compress\zstd_double_fast.c"
3662+ >
3663+ </File>
3664+ <File
3665+ RelativePath="..\..\..\lib\compress\zstd_lazy.c"
3666+ >
3667+ </File>
3668+ <File
3669+ RelativePath="..\..\..\lib\compress\zstd_opt.c"
3670+ >
3671+ </File>
3672+ <File
3673+ RelativePath="..\..\..\lib\compress\zstd_ldm.c"
3674+ >
3675+ </File>
3676+ </Filter>
3677+ <Filter
3678+ Name="Header Files"
3679+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
3680+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
3681+ >
3682+ <File
3683+ RelativePath="..\..\..\lib\zstd.h"
3684+ >
3685+ </File>
3686+ <File
3687+ RelativePath="..\..\..\lib\common\bitstream.h"
3688+ >
3689+ </File>
3690+ <File
3691+ RelativePath="..\..\..\lib\common\error_private.h"
3692+ >
3693+ </File>
3694+ <File
3695+ RelativePath="..\..\..\lib\common\zstd_errors.h"
3696+ >
3697+ </File>
3698+ <File
3699+ RelativePath="..\..\..\lib\common\fse.h"
3700+ >
3701+ </File>
3702+ <File
3703+ RelativePath="..\..\..\lib\common\fse_static.h"
3704+ >
3705+ </File>
3706+ <File
3707+ RelativePath="..\..\..\lib\common\huf.h"
3708+ >
3709+ </File>
3710+ <File
3711+ RelativePath="..\..\..\lib\common\huf_static.h"
3712+ >
3713+ </File>
3714+ <File
3715+ RelativePath="..\..\..\lib\common\xxhash.h"
3716+ >
3717+ </File>
3718+ <File
3719+ RelativePath="..\..\..\lib\common\mem.h"
3720+ >
3721+ </File>
3722+ <File
3723+ RelativePath="..\..\..\lib\common\zstd_internal.h"
3724+ >
3725+ </File>
3726+ <File
3727+ RelativePath="..\..\..\lib\common\zstd_static.h"
3728+ >
3729+ </File>
3730+ <File
3731+ RelativePath="..\..\..\lib\compress\zstdmt_compress.h"
3732+ >
3733+ </File>
3734+ <File
3735+ RelativePath="..\..\..\lib\compress\zstd_compress.h"
3736+ >
3737+ </File>
3738+ <File
3739+ RelativePath="..\..\..\lib\compress\zstd_compress_literals.h"
3740+ >
3741+ </File>
3742+ <File
3743+ RelativePath="..\..\..\lib\compress\zstd_compress_sequences.h"
3744+ >
3745+ </File>
3746+ <File
3747+ RelativePath="..\..\..\lib\compress\zstd_cwksp.h"
3748+ >
3749+ </File>
3750+ <File
3751+ RelativePath="..\..\..\lib\compress\zstd_compress_superblock.h"
3752+ >
3753+ </File>
3754+ <File
3755+ RelativePath="..\..\..\lib\compress\zstd_fast.h"
3756+ >
3757+ </File>
3758+ <File
3759+ RelativePath="..\..\..\lib\compress\zstd_double_fast.h"
3760+ >
3761+ </File>
3762+ <File
3763+ RelativePath="..\..\..\lib\compress\zstd_lazy.h"
3764+ >
3765+ </File>
3766+ <File
3767+ RelativePath="..\..\..\lib\compress\zstd_opt.h"
3768+ >
3769+ </File>
3770+ <File
3771+ RelativePath="..\..\..\lib\compress\zstd_ldm.h"
3772+ >
3773+ </File>
3774+ </Filter>
3775+ </Files>
3776+ <Globals>
3777+ </Globals>
3778+</VisualStudioProject>
3779+>>>>>>> src/zstd/build/VS2008/fullbench/fullbench.vcproj
3780diff --git a/src/zstd/build/VS2008/fuzzer/fuzzer.vcproj b/src/zstd/build/VS2008/fuzzer/fuzzer.vcproj
3781index 91b99d8..8a3460c 100644
3782--- a/src/zstd/build/VS2008/fuzzer/fuzzer.vcproj
3783+++ b/src/zstd/build/VS2008/fuzzer/fuzzer.vcproj
3784@@ -1,3 +1,4 @@
3785+<<<<<<< src/zstd/build/VS2008/fuzzer/fuzzer.vcproj
3786 <?xml version="1.0" encoding="Windows-1252"?>
3787 <VisualStudioProject
3788 ProjectType="Visual C++"
3789@@ -583,3 +584,590 @@
3790 <Globals>
3791 </Globals>
3792 </VisualStudioProject>
3793+=======
3794+<?xml version="1.0" encoding="Windows-1252"?>
3795+<VisualStudioProject
3796+ ProjectType="Visual C++"
3797+ Version="9.00"
3798+ Name="fuzzer"
3799+ ProjectGUID="{A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}"
3800+ RootNamespace="fuzzer"
3801+ Keyword="Win32Proj"
3802+ TargetFrameworkVersion="196613"
3803+ >
3804+ <Platforms>
3805+ <Platform
3806+ Name="Win32"
3807+ />
3808+ <Platform
3809+ Name="x64"
3810+ />
3811+ </Platforms>
3812+ <ToolFiles>
3813+ </ToolFiles>
3814+ <Configurations>
3815+ <Configuration
3816+ Name="Debug|Win32"
3817+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
3818+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
3819+ ConfigurationType="1"
3820+ CharacterSet="2"
3821+ >
3822+ <Tool
3823+ Name="VCPreBuildEventTool"
3824+ />
3825+ <Tool
3826+ Name="VCCustomBuildTool"
3827+ />
3828+ <Tool
3829+ Name="VCXMLDataGeneratorTool"
3830+ />
3831+ <Tool
3832+ Name="VCWebServiceProxyGeneratorTool"
3833+ />
3834+ <Tool
3835+ Name="VCMIDLTool"
3836+ />
3837+ <Tool
3838+ Name="VCCLCompilerTool"
3839+ Optimization="0"
3840+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs"
3841+ PreprocessorDefinitions="ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE"
3842+ MinimalRebuild="true"
3843+ BasicRuntimeChecks="3"
3844+ RuntimeLibrary="3"
3845+ UsePrecompiledHeader="0"
3846+ WarningLevel="4"
3847+ WarnAsError="true"
3848+ DebugInformationFormat="4"
3849+ />
3850+ <Tool
3851+ Name="VCManagedResourceCompilerTool"
3852+ />
3853+ <Tool
3854+ Name="VCResourceCompilerTool"
3855+ />
3856+ <Tool
3857+ Name="VCPreLinkEventTool"
3858+ />
3859+ <Tool
3860+ Name="VCLinkerTool"
3861+ LinkIncremental="2"
3862+ GenerateDebugInformation="true"
3863+ SubSystem="1"
3864+ TargetMachine="1"
3865+ />
3866+ <Tool
3867+ Name="VCALinkTool"
3868+ />
3869+ <Tool
3870+ Name="VCManifestTool"
3871+ />
3872+ <Tool
3873+ Name="VCXDCMakeTool"
3874+ />
3875+ <Tool
3876+ Name="VCBscMakeTool"
3877+ />
3878+ <Tool
3879+ Name="VCFxCopTool"
3880+ />
3881+ <Tool
3882+ Name="VCAppVerifierTool"
3883+ />
3884+ <Tool
3885+ Name="VCPostBuildEventTool"
3886+ />
3887+ </Configuration>
3888+ <Configuration
3889+ Name="Release|Win32"
3890+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
3891+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
3892+ ConfigurationType="1"
3893+ CharacterSet="2"
3894+ WholeProgramOptimization="1"
3895+ >
3896+ <Tool
3897+ Name="VCPreBuildEventTool"
3898+ />
3899+ <Tool
3900+ Name="VCCustomBuildTool"
3901+ />
3902+ <Tool
3903+ Name="VCXMLDataGeneratorTool"
3904+ />
3905+ <Tool
3906+ Name="VCWebServiceProxyGeneratorTool"
3907+ />
3908+ <Tool
3909+ Name="VCMIDLTool"
3910+ />
3911+ <Tool
3912+ Name="VCCLCompilerTool"
3913+ Optimization="2"
3914+ EnableIntrinsicFunctions="true"
3915+ OmitFramePointers="true"
3916+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs"
3917+ PreprocessorDefinitions="ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE"
3918+ RuntimeLibrary="0"
3919+ EnableFunctionLevelLinking="true"
3920+ UsePrecompiledHeader="0"
3921+ WarningLevel="4"
3922+ DebugInformationFormat="3"
3923+ />
3924+ <Tool
3925+ Name="VCManagedResourceCompilerTool"
3926+ />
3927+ <Tool
3928+ Name="VCResourceCompilerTool"
3929+ />
3930+ <Tool
3931+ Name="VCPreLinkEventTool"
3932+ />
3933+ <Tool
3934+ Name="VCLinkerTool"
3935+ LinkIncremental="1"
3936+ GenerateDebugInformation="true"
3937+ SubSystem="1"
3938+ OptimizeReferences="2"
3939+ EnableCOMDATFolding="2"
3940+ TargetMachine="1"
3941+ />
3942+ <Tool
3943+ Name="VCALinkTool"
3944+ />
3945+ <Tool
3946+ Name="VCManifestTool"
3947+ />
3948+ <Tool
3949+ Name="VCXDCMakeTool"
3950+ />
3951+ <Tool
3952+ Name="VCBscMakeTool"
3953+ />
3954+ <Tool
3955+ Name="VCFxCopTool"
3956+ />
3957+ <Tool
3958+ Name="VCAppVerifierTool"
3959+ />
3960+ <Tool
3961+ Name="VCPostBuildEventTool"
3962+ />
3963+ </Configuration>
3964+ <Configuration
3965+ Name="Debug|x64"
3966+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
3967+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
3968+ ConfigurationType="1"
3969+ CharacterSet="2"
3970+ >
3971+ <Tool
3972+ Name="VCPreBuildEventTool"
3973+ />
3974+ <Tool
3975+ Name="VCCustomBuildTool"
3976+ />
3977+ <Tool
3978+ Name="VCXMLDataGeneratorTool"
3979+ />
3980+ <Tool
3981+ Name="VCWebServiceProxyGeneratorTool"
3982+ />
3983+ <Tool
3984+ Name="VCMIDLTool"
3985+ TargetEnvironment="3"
3986+ />
3987+ <Tool
3988+ Name="VCCLCompilerTool"
3989+ Optimization="0"
3990+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\programs"
3991+ PreprocessorDefinitions="ZSTD_MULTITHREAD=1;WIN32;_DEBUG;_CONSOLE"
3992+ MinimalRebuild="true"
3993+ BasicRuntimeChecks="3"
3994+ RuntimeLibrary="3"
3995+ UsePrecompiledHeader="0"
3996+ WarningLevel="4"
3997+ WarnAsError="true"
3998+ DebugInformationFormat="3"
3999+ />
4000+ <Tool
4001+ Name="VCManagedResourceCompilerTool"
4002+ />
4003+ <Tool
4004+ Name="VCResourceCompilerTool"
4005+ />
4006+ <Tool
4007+ Name="VCPreLinkEventTool"
4008+ />
4009+ <Tool
4010+ Name="VCLinkerTool"
4011+ LinkIncremental="2"
4012+ GenerateDebugInformation="true"
4013+ SubSystem="1"
4014+ TargetMachine="17"
4015+ />
4016+ <Tool
4017+ Name="VCALinkTool"
4018+ />
4019+ <Tool
4020+ Name="VCManifestTool"
4021+ />
4022+ <Tool
4023+ Name="VCXDCMakeTool"
4024+ />
4025+ <Tool
4026+ Name="VCBscMakeTool"
4027+ />
4028+ <Tool
4029+ Name="VCFxCopTool"
4030+ />
4031+ <Tool
4032+ Name="VCAppVerifierTool"
4033+ />
4034+ <Tool
4035+ Name="VCPostBuildEventTool"
4036+ />
4037+ </Configuration>
4038+ <Configuration
4039+ Name="Release|x64"
4040+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
4041+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
4042+ ConfigurationType="1"
4043+ CharacterSet="2"
4044+ WholeProgramOptimization="1"
4045+ >
4046+ <Tool
4047+ Name="VCPreBuildEventTool"
4048+ />
4049+ <Tool
4050+ Name="VCCustomBuildTool"
4051+ />
4052+ <Tool
4053+ Name="VCXMLDataGeneratorTool"
4054+ />
4055+ <Tool
4056+ Name="VCWebServiceProxyGeneratorTool"
4057+ />
4058+ <Tool
4059+ Name="VCMIDLTool"
4060+ TargetEnvironment="3"
4061+ />
4062+ <Tool
4063+ Name="VCCLCompilerTool"
4064+ Optimization="2"
4065+ EnableIntrinsicFunctions="true"
4066+ OmitFramePointers="true"
4067+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\programs"
4068+ PreprocessorDefinitions="ZSTD_MULTITHREAD=1;WIN32;NDEBUG;_CONSOLE"
4069+ RuntimeLibrary="0"
4070+ EnableFunctionLevelLinking="true"
4071+ UsePrecompiledHeader="0"
4072+ WarningLevel="4"
4073+ DebugInformationFormat="3"
4074+ />
4075+ <Tool
4076+ Name="VCManagedResourceCompilerTool"
4077+ />
4078+ <Tool
4079+ Name="VCResourceCompilerTool"
4080+ />
4081+ <Tool
4082+ Name="VCPreLinkEventTool"
4083+ />
4084+ <Tool
4085+ Name="VCLinkerTool"
4086+ LinkIncremental="1"
4087+ GenerateDebugInformation="true"
4088+ SubSystem="1"
4089+ OptimizeReferences="2"
4090+ EnableCOMDATFolding="2"
4091+ TargetMachine="17"
4092+ />
4093+ <Tool
4094+ Name="VCALinkTool"
4095+ />
4096+ <Tool
4097+ Name="VCManifestTool"
4098+ />
4099+ <Tool
4100+ Name="VCXDCMakeTool"
4101+ />
4102+ <Tool
4103+ Name="VCBscMakeTool"
4104+ />
4105+ <Tool
4106+ Name="VCFxCopTool"
4107+ />
4108+ <Tool
4109+ Name="VCAppVerifierTool"
4110+ />
4111+ <Tool
4112+ Name="VCPostBuildEventTool"
4113+ />
4114+ </Configuration>
4115+ </Configurations>
4116+ <References>
4117+ </References>
4118+ <Files>
4119+ <Filter
4120+ Name="Source Files"
4121+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
4122+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
4123+ >
4124+ <File
4125+ RelativePath="..\..\..\programs\util.c"
4126+ >
4127+ </File>
4128+ <File
4129+ RelativePath="..\..\..\programs\timefn.c"
4130+ >
4131+ </File>
4132+ <File
4133+ RelativePath="..\..\..\programs\datagen.c"
4134+ >
4135+ </File>
4136+ <File
4137+ RelativePath="..\..\..\lib\dictBuilder\cover.c"
4138+ >
4139+ </File>
4140+ <File
4141+ RelativePath="..\..\..\lib\dictBuilder\fastcover.c"
4142+ >
4143+ </File>
4144+ <File
4145+ RelativePath="..\..\..\lib\dictBuilder\divsufsort.c"
4146+ >
4147+ </File>
4148+ <File
4149+ RelativePath="..\..\..\lib\common\pool.c"
4150+ >
4151+ </File>
4152+ <File
4153+ RelativePath="..\..\..\lib\common\threading.c"
4154+ >
4155+ </File>
4156+ <File
4157+ RelativePath="..\..\..\lib\common\entropy_common.c"
4158+ >
4159+ </File>
4160+ <File
4161+ RelativePath="..\..\..\lib\compress\hist.c"
4162+ >
4163+ </File>
4164+ <File
4165+ RelativePath="..\..\..\lib\common\error_private.c"
4166+ >
4167+ </File>
4168+ <File
4169+ RelativePath="..\..\..\lib\compress\fse_compress.c"
4170+ >
4171+ </File>
4172+ <File
4173+ RelativePath="..\..\..\lib\common\fse_decompress.c"
4174+ >
4175+ </File>
4176+ <File
4177+ RelativePath="..\..\..\tests\fuzzer.c"
4178+ >
4179+ </File>
4180+ <File
4181+ RelativePath="..\..\..\lib\compress\huf_compress.c"
4182+ >
4183+ </File>
4184+ <File
4185+ RelativePath="..\..\..\lib\decompress\huf_decompress.c"
4186+ >
4187+ </File>
4188+ <File
4189+ RelativePath="..\..\..\lib\common\xxhash.c"
4190+ >
4191+ </File>
4192+ <File
4193+ RelativePath="..\..\..\lib\dictBuilder\zdict.c"
4194+ >
4195+ </File>
4196+ <File
4197+ RelativePath="..\..\..\lib\common\zstd_common.c"
4198+ >
4199+ </File>
4200+ <File
4201+ RelativePath="..\..\..\lib\compress\zstdmt_compress.c"
4202+ >
4203+ </File>
4204+ <File
4205+ RelativePath="..\..\..\lib\compress\zstd_compress.c"
4206+ >
4207+ </File>
4208+ <File
4209+ RelativePath="..\..\..\lib\compress\zstd_compress_literals.c"
4210+ >
4211+ </File>
4212+ <File
4213+ RelativePath="..\..\..\lib\compress\zstd_compress_sequences.c"
4214+ >
4215+ </File>
4216+ <File
4217+ RelativePath="..\..\..\lib\compress\zstd_compress_superblock.c"
4218+ >
4219+ </File>
4220+ <File
4221+ RelativePath="..\..\..\lib\decompress\zstd_decompress.c"
4222+ >
4223+ </File>
4224+ <File
4225+ RelativePath="..\..\..\lib\decompress\zstd_decompress_block.c"
4226+ >
4227+ </File>
4228+ <File
4229+ RelativePath="..\..\..\lib\decompress\zstd_ddict.c"
4230+ >
4231+ </File>
4232+ <File
4233+ RelativePath="..\..\..\lib\compress\zstd_fast.c"
4234+ >
4235+ </File>
4236+ <File
4237+ RelativePath="..\..\..\lib\compress\zstd_double_fast.c"
4238+ >
4239+ </File>
4240+ <File
4241+ RelativePath="..\..\..\lib\compress\zstd_lazy.c"
4242+ >
4243+ </File>
4244+ <File
4245+ RelativePath="..\..\..\lib\compress\zstd_opt.c"
4246+ >
4247+ </File>
4248+ <File
4249+ RelativePath="..\..\..\lib\compress\zstd_ldm.c"
4250+ >
4251+ </File>
4252+ </Filter>
4253+ <Filter
4254+ Name="Header Files"
4255+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
4256+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
4257+ >
4258+ <File
4259+ RelativePath="..\..\..\lib\common\bitstream.h"
4260+ >
4261+ </File>
4262+ <File
4263+ RelativePath="..\..\..\lib\dictBuilder\divsufsort.h"
4264+ >
4265+ </File>
4266+ <File
4267+ RelativePath="..\..\..\lib\common\pool.h"
4268+ >
4269+ </File>
4270+ <File
4271+ RelativePath="..\..\..\lib\common\threading.h"
4272+ >
4273+ </File>
4274+ <File
4275+ RelativePath="..\..\..\lib\common\error_private.h"
4276+ >
4277+ </File>
4278+ <File
4279+ RelativePath="..\..\..\lib\common\zstd_errors.h"
4280+ >
4281+ </File>
4282+ <File
4283+ RelativePath="..\..\..\lib\common\fse.h"
4284+ >
4285+ </File>
4286+ <File
4287+ RelativePath="..\..\..\lib\common\fse_static.h"
4288+ >
4289+ </File>
4290+ <File
4291+ RelativePath="..\..\..\lib\common\huf.h"
4292+ >
4293+ </File>
4294+ <File
4295+ RelativePath="..\..\..\lib\common\huf_static.h"
4296+ >
4297+ </File>
4298+ <File
4299+ RelativePath="..\..\..\lib\common\mem.h"
4300+ >
4301+ </File>
4302+ <File
4303+ RelativePath="..\..\..\lib\common\xxhash.h"
4304+ >
4305+ </File>
4306+ <File
4307+ RelativePath="..\..\..\lib\dictBuilder\zdict.h"
4308+ >
4309+ </File>
4310+ <File
4311+ RelativePath="..\..\..\lib\dictBuilder\cover.h"
4312+ >
4313+ </File>
4314+ <File
4315+ RelativePath="..\..\..\lib\dictBuilder\zdict_static.h"
4316+ >
4317+ </File>
4318+ <File
4319+ RelativePath="..\..\..\lib\zstd.h"
4320+ >
4321+ </File>
4322+ <File
4323+ RelativePath="..\..\..\lib\common\zstd_internal.h"
4324+ >
4325+ </File>
4326+ <File
4327+ RelativePath="..\..\..\lib\compress\zstdmt_compress.h"
4328+ >
4329+ </File>
4330+ <File
4331+ RelativePath="..\..\..\lib\common\zstd_static.h"
4332+ >
4333+ </File>
4334+ <File
4335+ RelativePath="..\..\..\lib\compress\zstd_compress.h"
4336+ >
4337+ </File>
4338+ <File
4339+ RelativePath="..\..\..\lib\compress\zstd_compress_literals.h"
4340+ >
4341+ </File>
4342+ <File
4343+ RelativePath="..\..\..\lib\compress\zstd_compress_sequences.h"
4344+ >
4345+ </File>
4346+ <File
4347+ RelativePath="..\..\..\lib\compress\zstd_cwksp.h"
4348+ >
4349+ </File>
4350+ <File
4351+ RelativePath="..\..\..\lib\compress\zstd_compress_superblock.h"
4352+ >
4353+ </File>
4354+ <File
4355+ RelativePath="..\..\..\lib\compress\zstd_fast.h"
4356+ >
4357+ </File>
4358+ <File
4359+ RelativePath="..\..\..\lib\compress\zstd_double_fast.h"
4360+ >
4361+ </File>
4362+ <File
4363+ RelativePath="..\..\..\lib\compress\zstd_lazy.h"
4364+ >
4365+ </File>
4366+ <File
4367+ RelativePath="..\..\..\lib\compress\zstd_opt.h"
4368+ >
4369+ </File>
4370+ <File
4371+ RelativePath="..\..\..\lib\compress\zstd_ldm.h"
4372+ >
4373+ </File>
4374+ </Filter>
4375+ </Files>
4376+ <Globals>
4377+ </Globals>
4378+</VisualStudioProject>
4379+>>>>>>> src/zstd/build/VS2008/fuzzer/fuzzer.vcproj
4380diff --git a/src/zstd/build/VS2008/zstd.sln b/src/zstd/build/VS2008/zstd.sln
4381index 89b6993..baf1774 100644
4382--- a/src/zstd/build/VS2008/zstd.sln
4383+++ b/src/zstd/build/VS2008/zstd.sln
4384@@ -1,3 +1,4 @@
4385+<<<<<<< src/zstd/build/VS2008/zstd.sln
4386
4387 Microsoft Visual Studio Solution File, Format Version 10.00
4388 # Visual Studio 2008
4389@@ -54,3 +55,61 @@ Global
4390 HideSolutionNode = FALSE
4391 EndGlobalSection
4392 EndGlobal
4393+=======
4394+
4395+Microsoft Visual Studio Solution File, Format Version 10.00
4396+# Visual Studio 2008
4397+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "zstd\zstd.vcproj", "{1A2AB08E-5CE7-4C5B-BE55-458157C14051}"
4398+EndProject
4399+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fuzzer", "fuzzer\fuzzer.vcproj", "{A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}"
4400+EndProject
4401+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench", "fullbench\fullbench.vcproj", "{CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}"
4402+EndProject
4403+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstdlib", "zstdlib\zstdlib.vcproj", "{99DE2A79-7298-4004-A0ED-030D7A3796CA}"
4404+EndProject
4405+Global
4406+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
4407+ Debug|Win32 = Debug|Win32
4408+ Debug|x64 = Debug|x64
4409+ Release|Win32 = Release|Win32
4410+ Release|x64 = Release|x64
4411+ EndGlobalSection
4412+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
4413+ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|Win32.ActiveCfg = Debug|Win32
4414+ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|Win32.Build.0 = Debug|Win32
4415+ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|x64.ActiveCfg = Debug|x64
4416+ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Debug|x64.Build.0 = Debug|x64
4417+ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|Win32.ActiveCfg = Release|Win32
4418+ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|Win32.Build.0 = Release|Win32
4419+ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|x64.ActiveCfg = Release|x64
4420+ {1A2AB08E-5CE7-4C5B-BE55-458157C14051}.Release|x64.Build.0 = Release|x64
4421+ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|Win32.ActiveCfg = Debug|Win32
4422+ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|Win32.Build.0 = Debug|Win32
4423+ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|x64.ActiveCfg = Debug|x64
4424+ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Debug|x64.Build.0 = Debug|x64
4425+ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|Win32.ActiveCfg = Release|Win32
4426+ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|Win32.Build.0 = Release|Win32
4427+ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|x64.ActiveCfg = Release|x64
4428+ {A62E89D2-9DDE-42BA-8F9B-9DA74889A6B0}.Release|x64.Build.0 = Release|x64
4429+ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|Win32.ActiveCfg = Debug|Win32
4430+ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|Win32.Build.0 = Debug|Win32
4431+ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|x64.ActiveCfg = Debug|x64
4432+ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Debug|x64.Build.0 = Debug|x64
4433+ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|Win32.ActiveCfg = Release|Win32
4434+ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|Win32.Build.0 = Release|Win32
4435+ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|x64.ActiveCfg = Release|x64
4436+ {CC8F1D1B-BA2F-43E3-A71F-FA415D81AAD3}.Release|x64.Build.0 = Release|x64
4437+ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|Win32.ActiveCfg = Debug|Win32
4438+ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|Win32.Build.0 = Debug|Win32
4439+ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|x64.ActiveCfg = Debug|x64
4440+ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Debug|x64.Build.0 = Debug|x64
4441+ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|Win32.ActiveCfg = Release|Win32
4442+ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|Win32.Build.0 = Release|Win32
4443+ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|x64.ActiveCfg = Release|x64
4444+ {99DE2A79-7298-4004-A0ED-030D7A3796CA}.Release|x64.Build.0 = Release|x64
4445+ EndGlobalSection
4446+ GlobalSection(SolutionProperties) = preSolution
4447+ HideSolutionNode = FALSE
4448+ EndGlobalSection
4449+EndGlobal
4450+>>>>>>> src/zstd/build/VS2008/zstd.sln
4451diff --git a/src/zstd/build/VS2008/zstd/zstd.vcproj b/src/zstd/build/VS2008/zstd/zstd.vcproj
4452index 5876f9c..19204b0 100644
4453--- a/src/zstd/build/VS2008/zstd/zstd.vcproj
4454+++ b/src/zstd/build/VS2008/zstd/zstd.vcproj
4455@@ -1,3 +1,4 @@
4456+<<<<<<< src/zstd/build/VS2008/zstd/zstd.vcproj
4457 <?xml version="1.0" encoding="Windows-1252"?>
4458 <VisualStudioProject
4459 ProjectType="Visual C++"
4460@@ -663,3 +664,670 @@
4461 <Globals>
4462 </Globals>
4463 </VisualStudioProject>
4464+=======
4465+<?xml version="1.0" encoding="Windows-1252"?>
4466+<VisualStudioProject
4467+ ProjectType="Visual C++"
4468+ Version="9.00"
4469+ Name="zstd"
4470+ ProjectGUID="{1A2AB08E-5CE7-4C5B-BE55-458157C14051}"
4471+ RootNamespace="zstd"
4472+ Keyword="Win32Proj"
4473+ TargetFrameworkVersion="196613"
4474+ >
4475+ <Platforms>
4476+ <Platform
4477+ Name="Win32"
4478+ />
4479+ <Platform
4480+ Name="x64"
4481+ />
4482+ </Platforms>
4483+ <ToolFiles>
4484+ </ToolFiles>
4485+ <Configurations>
4486+ <Configuration
4487+ Name="Debug|Win32"
4488+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
4489+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
4490+ ConfigurationType="1"
4491+ CharacterSet="2"
4492+ >
4493+ <Tool
4494+ Name="VCPreBuildEventTool"
4495+ />
4496+ <Tool
4497+ Name="VCCustomBuildTool"
4498+ />
4499+ <Tool
4500+ Name="VCXMLDataGeneratorTool"
4501+ />
4502+ <Tool
4503+ Name="VCWebServiceProxyGeneratorTool"
4504+ />
4505+ <Tool
4506+ Name="VCMIDLTool"
4507+ />
4508+ <Tool
4509+ Name="VCCLCompilerTool"
4510+ Optimization="0"
4511+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\compress"
4512+ PreprocessorDefinitions="ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=5;WIN32;_DEBUG;_CONSOLE"
4513+ MinimalRebuild="true"
4514+ BasicRuntimeChecks="3"
4515+ RuntimeLibrary="3"
4516+ UsePrecompiledHeader="0"
4517+ WarningLevel="4"
4518+ WarnAsError="true"
4519+ DebugInformationFormat="4"
4520+ />
4521+ <Tool
4522+ Name="VCManagedResourceCompilerTool"
4523+ />
4524+ <Tool
4525+ Name="VCResourceCompilerTool"
4526+ />
4527+ <Tool
4528+ Name="VCPreLinkEventTool"
4529+ />
4530+ <Tool
4531+ Name="VCLinkerTool"
4532+ AdditionalDependencies="setargv.obj"
4533+ LinkIncremental="2"
4534+ GenerateDebugInformation="true"
4535+ SubSystem="1"
4536+ TargetMachine="1"
4537+ />
4538+ <Tool
4539+ Name="VCALinkTool"
4540+ />
4541+ <Tool
4542+ Name="VCManifestTool"
4543+ />
4544+ <Tool
4545+ Name="VCXDCMakeTool"
4546+ />
4547+ <Tool
4548+ Name="VCBscMakeTool"
4549+ />
4550+ <Tool
4551+ Name="VCFxCopTool"
4552+ />
4553+ <Tool
4554+ Name="VCAppVerifierTool"
4555+ />
4556+ <Tool
4557+ Name="VCPostBuildEventTool"
4558+ />
4559+ </Configuration>
4560+ <Configuration
4561+ Name="Release|Win32"
4562+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
4563+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
4564+ ConfigurationType="1"
4565+ CharacterSet="2"
4566+ WholeProgramOptimization="1"
4567+ >
4568+ <Tool
4569+ Name="VCPreBuildEventTool"
4570+ />
4571+ <Tool
4572+ Name="VCCustomBuildTool"
4573+ />
4574+ <Tool
4575+ Name="VCXMLDataGeneratorTool"
4576+ />
4577+ <Tool
4578+ Name="VCWebServiceProxyGeneratorTool"
4579+ />
4580+ <Tool
4581+ Name="VCMIDLTool"
4582+ />
4583+ <Tool
4584+ Name="VCCLCompilerTool"
4585+ Optimization="2"
4586+ EnableIntrinsicFunctions="true"
4587+ OmitFramePointers="true"
4588+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\compress"
4589+ PreprocessorDefinitions="ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=5;WIN32;NDEBUG;_CONSOLE"
4590+ RuntimeLibrary="0"
4591+ EnableFunctionLevelLinking="true"
4592+ UsePrecompiledHeader="0"
4593+ WarningLevel="4"
4594+ DebugInformationFormat="3"
4595+ />
4596+ <Tool
4597+ Name="VCManagedResourceCompilerTool"
4598+ />
4599+ <Tool
4600+ Name="VCResourceCompilerTool"
4601+ />
4602+ <Tool
4603+ Name="VCPreLinkEventTool"
4604+ />
4605+ <Tool
4606+ Name="VCLinkerTool"
4607+ AdditionalDependencies="setargv.obj"
4608+ LinkIncremental="1"
4609+ GenerateDebugInformation="true"
4610+ SubSystem="1"
4611+ OptimizeReferences="2"
4612+ EnableCOMDATFolding="2"
4613+ TargetMachine="1"
4614+ />
4615+ <Tool
4616+ Name="VCALinkTool"
4617+ />
4618+ <Tool
4619+ Name="VCManifestTool"
4620+ />
4621+ <Tool
4622+ Name="VCXDCMakeTool"
4623+ />
4624+ <Tool
4625+ Name="VCBscMakeTool"
4626+ />
4627+ <Tool
4628+ Name="VCFxCopTool"
4629+ />
4630+ <Tool
4631+ Name="VCAppVerifierTool"
4632+ />
4633+ <Tool
4634+ Name="VCPostBuildEventTool"
4635+ />
4636+ </Configuration>
4637+ <Configuration
4638+ Name="Debug|x64"
4639+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
4640+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
4641+ ConfigurationType="1"
4642+ CharacterSet="2"
4643+ >
4644+ <Tool
4645+ Name="VCPreBuildEventTool"
4646+ />
4647+ <Tool
4648+ Name="VCCustomBuildTool"
4649+ />
4650+ <Tool
4651+ Name="VCXMLDataGeneratorTool"
4652+ />
4653+ <Tool
4654+ Name="VCWebServiceProxyGeneratorTool"
4655+ />
4656+ <Tool
4657+ Name="VCMIDLTool"
4658+ TargetEnvironment="3"
4659+ />
4660+ <Tool
4661+ Name="VCCLCompilerTool"
4662+ Optimization="0"
4663+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\compress"
4664+ PreprocessorDefinitions="ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=5;WIN32;_DEBUG;_CONSOLE"
4665+ MinimalRebuild="true"
4666+ BasicRuntimeChecks="3"
4667+ RuntimeLibrary="3"
4668+ UsePrecompiledHeader="0"
4669+ WarningLevel="4"
4670+ WarnAsError="true"
4671+ DebugInformationFormat="3"
4672+ />
4673+ <Tool
4674+ Name="VCManagedResourceCompilerTool"
4675+ />
4676+ <Tool
4677+ Name="VCResourceCompilerTool"
4678+ />
4679+ <Tool
4680+ Name="VCPreLinkEventTool"
4681+ />
4682+ <Tool
4683+ Name="VCLinkerTool"
4684+ AdditionalDependencies="setargv.obj"
4685+ LinkIncremental="2"
4686+ GenerateDebugInformation="true"
4687+ SubSystem="1"
4688+ TargetMachine="17"
4689+ />
4690+ <Tool
4691+ Name="VCALinkTool"
4692+ />
4693+ <Tool
4694+ Name="VCManifestTool"
4695+ />
4696+ <Tool
4697+ Name="VCXDCMakeTool"
4698+ />
4699+ <Tool
4700+ Name="VCBscMakeTool"
4701+ />
4702+ <Tool
4703+ Name="VCFxCopTool"
4704+ />
4705+ <Tool
4706+ Name="VCAppVerifierTool"
4707+ />
4708+ <Tool
4709+ Name="VCPostBuildEventTool"
4710+ />
4711+ </Configuration>
4712+ <Configuration
4713+ Name="Release|x64"
4714+ OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)"
4715+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
4716+ ConfigurationType="1"
4717+ CharacterSet="2"
4718+ WholeProgramOptimization="1"
4719+ >
4720+ <Tool
4721+ Name="VCPreBuildEventTool"
4722+ />
4723+ <Tool
4724+ Name="VCCustomBuildTool"
4725+ />
4726+ <Tool
4727+ Name="VCXMLDataGeneratorTool"
4728+ />
4729+ <Tool
4730+ Name="VCWebServiceProxyGeneratorTool"
4731+ />
4732+ <Tool
4733+ Name="VCMIDLTool"
4734+ TargetEnvironment="3"
4735+ />
4736+ <Tool
4737+ Name="VCCLCompilerTool"
4738+ Optimization="2"
4739+ EnableIntrinsicFunctions="true"
4740+ OmitFramePointers="true"
4741+ AdditionalIncludeDirectories="$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\dictBuilder;$(SolutionDir)..\..\lib\compress"
4742+ PreprocessorDefinitions="ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=5;WIN32;NDEBUG;_CONSOLE"
4743+ RuntimeLibrary="0"
4744+ EnableFunctionLevelLinking="true"
4745+ UsePrecompiledHeader="0"
4746+ WarningLevel="4"
4747+ DebugInformationFormat="3"
4748+ />
4749+ <Tool
4750+ Name="VCManagedResourceCompilerTool"
4751+ />
4752+ <Tool
4753+ Name="VCResourceCompilerTool"
4754+ />
4755+ <Tool
4756+ Name="VCPreLinkEventTool"
4757+ />
4758+ <Tool
4759+ Name="VCLinkerTool"
4760+ AdditionalDependencies="setargv.obj"
4761+ LinkIncremental="1"
4762+ GenerateDebugInformation="true"
4763+ SubSystem="1"
4764+ OptimizeReferences="2"
4765+ EnableCOMDATFolding="2"
4766+ TargetMachine="17"
4767+ />
4768+ <Tool
4769+ Name="VCALinkTool"
4770+ />
4771+ <Tool
4772+ Name="VCManifestTool"
4773+ />
4774+ <Tool
4775+ Name="VCXDCMakeTool"
4776+ />
4777+ <Tool
4778+ Name="VCBscMakeTool"
4779+ />
4780+ <Tool
4781+ Name="VCFxCopTool"
4782+ />
4783+ <Tool
4784+ Name="VCAppVerifierTool"
4785+ />
4786+ <Tool
4787+ Name="VCPostBuildEventTool"
4788+ />
4789+ </Configuration>
4790+ </Configurations>
4791+ <References>
4792+ </References>
4793+ <Files>
4794+ <Filter
4795+ Name="Source Files"
4796+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
4797+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
4798+ >
4799+ <File
4800+ RelativePath="..\..\..\programs\util.c"
4801+ >
4802+ </File>
4803+ <File
4804+ RelativePath="..\..\..\programs\timefn.c"
4805+ >
4806+ </File>
4807+ <File
4808+ RelativePath="..\..\..\programs\benchfn.c"
4809+ >
4810+ </File>
4811+ <File
4812+ RelativePath="..\..\..\programs\benchzstd.c"
4813+ >
4814+ </File>
4815+ <File
4816+ RelativePath="..\..\..\programs\datagen.c"
4817+ >
4818+ </File>
4819+ <File
4820+ RelativePath="..\..\..\programs\dibio.c"
4821+ >
4822+ </File>
4823+ <File
4824+ RelativePath="..\..\..\lib\dictBuilder\cover.c"
4825+ >
4826+ </File>
4827+ <File
4828+ RelativePath="..\..\..\lib\dictBuilder\fastcover.c"
4829+ >
4830+ </File>
4831+ <File
4832+ RelativePath="..\..\..\lib\dictBuilder\divsufsort.c"
4833+ >
4834+ </File>
4835+ <File
4836+ RelativePath="..\..\..\lib\common\entropy_common.c"
4837+ >
4838+ </File>
4839+ <File
4840+ RelativePath="..\..\..\lib\compress\hist.c"
4841+ >
4842+ </File>
4843+ <File
4844+ RelativePath="..\..\..\lib\common\error_private.c"
4845+ >
4846+ </File>
4847+ <File
4848+ RelativePath="..\..\..\programs\fileio.c"
4849+ >
4850+ </File>
4851+ <File
4852+ RelativePath="..\..\..\lib\compress\fse_compress.c"
4853+ >
4854+ </File>
4855+ <File
4856+ RelativePath="..\..\..\lib\common\fse_decompress.c"
4857+ >
4858+ </File>
4859+ <File
4860+ RelativePath="..\..\..\lib\compress\huf_compress.c"
4861+ >
4862+ </File>
4863+ <File
4864+ RelativePath="..\..\..\lib\decompress\huf_decompress.c"
4865+ >
4866+ </File>
4867+ <File
4868+ RelativePath="..\..\..\lib\common\pool.c"
4869+ >
4870+ </File>
4871+ <File
4872+ RelativePath="..\..\..\lib\common\threading.c"
4873+ >
4874+ </File>
4875+ <File
4876+ RelativePath="..\..\..\lib\common\xxhash.c"
4877+ >
4878+ </File>
4879+ <File
4880+ RelativePath="..\..\..\lib\dictBuilder\zdict.c"
4881+ >
4882+ </File>
4883+ <File
4884+ RelativePath="..\..\..\lib\common\zstd_common.c"
4885+ >
4886+ </File>
4887+ <File
4888+ RelativePath="..\..\..\lib\compress\zstd_compress.c"
4889+ >
4890+ </File>
4891+ <File
4892+ RelativePath="..\..\..\lib\compress\zstd_compress_literals.c"
4893+ >
4894+ </File>
4895+ <File
4896+ RelativePath="..\..\..\lib\compress\zstd_compress_sequences.c"
4897+ >
4898+ </File>
4899+ <File
4900+ RelativePath="..\..\..\lib\compress\zstd_compress_superblock.c"
4901+ >
4902+ </File>
4903+ <File
4904+ RelativePath="..\..\..\lib\decompress\zstd_decompress.c"
4905+ >
4906+ </File>
4907+ <File
4908+ RelativePath="..\..\..\lib\decompress\zstd_decompress_block.c"
4909+ >
4910+ </File>
4911+ <File
4912+ RelativePath="..\..\..\lib\decompress\zstd_ddict.c"
4913+ >
4914+ </File>
4915+ <File
4916+ RelativePath="..\..\..\lib\legacy\zstd_v01.c"
4917+ >
4918+ </File>
4919+ <File
4920+ RelativePath="..\..\..\lib\legacy\zstd_v02.c"
4921+ >
4922+ </File>
4923+ <File
4924+ RelativePath="..\..\..\lib\legacy\zstd_v03.c"
4925+ >
4926+ </File>
4927+ <File
4928+ RelativePath="..\..\..\lib\legacy\zstd_v04.c"
4929+ >
4930+ </File>
4931+ <File
4932+ RelativePath="..\..\..\lib\legacy\zstd_v05.c"
4933+ >
4934+ </File>
4935+ <File
4936+ RelativePath="..\..\..\lib\legacy\zstd_v06.c"
4937+ >
4938+ </File>
4939+ <File
4940+ RelativePath="..\..\..\lib\legacy\zstd_v07.c"
4941+ >
4942+ </File>
4943+ <File
4944+ RelativePath="..\..\..\programs\zstdcli.c"
4945+ >
4946+ </File>
4947+ <File
4948+ RelativePath="..\..\..\lib\compress\zstdmt_compress.c"
4949+ >
4950+ </File>
4951+ <File
4952+ RelativePath="..\..\..\lib\compress\zstd_fast.c"
4953+ >
4954+ </File>
4955+ <File
4956+ RelativePath="..\..\..\lib\compress\zstd_double_fast.c"
4957+ >
4958+ </File>
4959+ <File
4960+ RelativePath="..\..\..\lib\compress\zstd_lazy.c"
4961+ >
4962+ </File>
4963+ <File
4964+ RelativePath="..\..\..\lib\compress\zstd_opt.c"
4965+ >
4966+ </File>
4967+ <File
4968+ RelativePath="..\..\..\lib\compress\zstd_ldm.c"
4969+ >
4970+ </File>
4971+ </Filter>
4972+ <Filter
4973+ Name="Header Files"
4974+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
4975+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
4976+ >
4977+ <File
4978+ RelativePath="..\..\..\lib\common\bitstream.h"
4979+ >
4980+ </File>
4981+ <File
4982+ RelativePath="..\..\..\lib\dictBuilder\divsufsort.h"
4983+ >
4984+ </File>
4985+ <File
4986+ RelativePath="..\..\..\lib\common\error_private.h"
4987+ >
4988+ </File>
4989+ <File
4990+ RelativePath="..\..\..\lib\common\fse.h"
4991+ >
4992+ </File>
4993+ <File
4994+ RelativePath="..\..\..\lib\common\fse_static.h"
4995+ >
4996+ </File>
4997+ <File
4998+ RelativePath="..\..\..\lib\common\huf.h"
4999+ >
5000+ </File>
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches