Author: roger
Date: Tue Jun 12 21:01:06 2012
New Revision: 1349524
URL: http://svn.apache.org/viewvc?rev=1349524&view=rev
Log:
THRIFT-1627 compiler built using compilers.vcxproj cannot be used to build some
test .thrift files
Patch: Andrew Cox
Modified:
thrift/trunk/compiler/cpp/compiler.vcxproj
thrift/trunk/compiler/cpp/compiler.vcxproj.filters
thrift/trunk/compiler/cpp/src/generate/t_delphi_generator.cc
thrift/trunk/compiler/cpp/src/thriftl.ll
thrift/trunk/compiler/cpp/src/windows/config.h
Modified: thrift/trunk/compiler/cpp/compiler.vcxproj
URL:
http://svn.apache.org/viewvc/thrift/trunk/compiler/cpp/compiler.vcxproj?rev=1349524&r1=1349523&r2=1349524&view=diff
==============================================================================
--- thrift/trunk/compiler/cpp/compiler.vcxproj (original)
+++ thrift/trunk/compiler/cpp/compiler.vcxproj Tue Jun 12 21:01:06 2012
@@ -22,6 +22,7 @@
<ClInclude Include="src\generate\t_generator.h" />
<ClInclude Include="src\generate\t_generator_registry.h" />
<ClInclude Include="src\generate\t_oop_generator.h" />
+ <ClInclude Include="src\generate\t_html_generator.h" />
<ClInclude Include="src\globals.h" />
<ClInclude Include="src\main.h" />
<ClInclude Include="src\md5.h" />
@@ -54,6 +55,8 @@
<ClCompile Include="src\generate\t_cpp_generator.cc" />
<ClCompile Include="src\generate\t_csharp_generator.cc" />
<ClCompile Include="src\generate\t_c_glib_generator.cc" />
+ <ClCompile Include="src\generate\t_d_generator.cc" />
+ <ClCompile Include="src\generate\t_delphi_generator.cc" />
<ClCompile Include="src\generate\t_erl_generator.cc" />
<ClCompile Include="src\generate\t_generator.cc" />
<ClCompile Include="src\generate\t_go_generator.cc" />
Modified: thrift/trunk/compiler/cpp/compiler.vcxproj.filters
URL:
http://svn.apache.org/viewvc/thrift/trunk/compiler/cpp/compiler.vcxproj.filters?rev=1349524&r1=1349523&r2=1349524&view=diff
==============================================================================
--- thrift/trunk/compiler/cpp/compiler.vcxproj.filters (original)
+++ thrift/trunk/compiler/cpp/compiler.vcxproj.filters Tue Jun 12 21:01:06 2012
@@ -10,6 +10,9 @@
<ClInclude Include="src\generate\t_oop_generator.h">
<Filter>generate</Filter>
</ClInclude>
+ <ClInclude Include="src\generate\t_html_generator.h">
+ <Filter>generate</Filter>
+ </ClInclude>
<ClInclude Include="src\globals.h" />
<ClInclude Include="src\main.h" />
<ClInclude Include="src\md5.h" />
@@ -103,6 +106,12 @@
<ClCompile Include="src\generate\t_c_glib_generator.cc">
<Filter>generate</Filter>
</ClCompile>
+ <ClCompile Include="src\generate\t_d_generator.cc">
+ <Filter>generate</Filter>
+ </ClCompile>
+ <ClCompile Include="src\generate\t_delphi_generator.cc">
+ <Filter>generate</Filter>
+ </ClCompile>
<ClCompile Include="src\generate\t_erl_generator.cc">
<Filter>generate</Filter>
</ClCompile>
Modified: thrift/trunk/compiler/cpp/src/generate/t_delphi_generator.cc
URL:
http://svn.apache.org/viewvc/thrift/trunk/compiler/cpp/src/generate/t_delphi_generator.cc?rev=1349524&r1=1349523&r2=1349524&view=diff
==============================================================================
--- thrift/trunk/compiler/cpp/src/generate/t_delphi_generator.cc (original)
+++ thrift/trunk/compiler/cpp/src/generate/t_delphi_generator.cc Tue Jun 12
21:01:06 2012
@@ -30,6 +30,7 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <sstream>
+#include <cctype>
#include "platform.h"
#include "t_oop_generator.h"
Modified: thrift/trunk/compiler/cpp/src/thriftl.ll
URL:
http://svn.apache.org/viewvc/thrift/trunk/compiler/cpp/src/thriftl.ll?rev=1349524&r1=1349523&r2=1349524&view=diff
==============================================================================
--- thrift/trunk/compiler/cpp/src/thriftl.ll (original)
+++ thrift/trunk/compiler/cpp/src/thriftl.ll Tue Jun 12 21:01:06 2012
@@ -38,6 +38,7 @@
#include <string>
#include <errno.h>
+#include <stdlib.h>
#include "main.h"
#include "globals.h"
Modified: thrift/trunk/compiler/cpp/src/windows/config.h
URL:
http://svn.apache.org/viewvc/thrift/trunk/compiler/cpp/src/windows/config.h?rev=1349524&r1=1349523&r2=1349524&view=diff
==============================================================================
--- thrift/trunk/compiler/cpp/src/windows/config.h (original)
+++ thrift/trunk/compiler/cpp/src/windows/config.h Tue Jun 12 21:01:06 2012
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <direct.h>
-#define strtoll(begin_ptr, end_ptr, length) strtol(begin_ptr, end_ptr, length)
+#define strtoll(begin_ptr, end_ptr, length) _strtoi64(begin_ptr, end_ptr,
length)
#define PRIu64 "I64d"
#define PRIi64 "I64d"
