Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift

2024-11-07 02:45:22 +00:00 · 2013-08-30 22:04:52 +02:00 · 2013-08-30 22:04:52 +02:00 · 17d42799eb
commit 17d42799eb
parent 5d9a72a28c fb89bb5fca
6 changed files with 4 additions and 0 deletions
--- a/compiler/cpp/README_Windows.txt
+++ b/compiler/cpp/README_Windows.txt
@ -24,6 +24,10 @@ Place a copy of bison.simple in thrift/compiler/cpp
 > bison -y -o "src/thrifty.cc" --defines src/thrifty.yy
 > move src\thrifty.cc.hh  src\thrifty.hh

+Bison might generate the yacc header file "thrifty.cc.h" with just one h ".h" extension; in this case you'll have to rename to "thrifty.h".
+
+> move src\windows\version.h.in src\windows\version.h
+
 Download inttypes.h from the interwebs and place it in an include path
 location (e.g. thrift/compiler/cpp/src).

--- a/lib/cpp/src/thrift/windows/StdAfx.cpp
+++ b/lib/cpp/src/thrift/windows/StdAfx.cpp
--- a/lib/cpp/src/thrift/windows/StdAfx.h
+++ b/lib/cpp/src/thrift/windows/StdAfx.h
--- a/lib/cpp/src/thrift/windows/TargetVersion.h
+++ b/lib/cpp/src/thrift/windows/TargetVersion.h
--- a/lib/cpp/src/thrift/windows/force_inc.h
+++ b/lib/cpp/src/thrift/windows/force_inc.h
--- a/lib/cpp/src/thrift/windows/tr1/functional
+++ b/lib/cpp/src/thrift/windows/tr1/functional