You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2011/07/19 02:59:13 UTC
svn commit: r1148116 [2/2] - in /zookeeper/trunk: ./ src/c/ src/c/include/
src/c/src/ src/c/src/hashtable/ src/java/main/org/apache/jute/compiler/
Added: zookeeper/trunk/src/c/zookeeper.vcproj
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/zookeeper.vcproj?rev=1148116&view=auto
==============================================================================
--- zookeeper/trunk/src/c/zookeeper.vcproj (added)
+++ zookeeper/trunk/src/c/zookeeper.vcproj Tue Jul 19 00:59:10 2011
@@ -0,0 +1,606 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="zookeeper"
+ ProjectGUID="{5754FB2B-5EA5-4988-851D-908CA533A626}"
+ RootNamespace="zookeeper"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="2"
+ UseOfMFC="0"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="$(ProjectDir)include;$(ProjectDir)generated;$(ProjectDir)hashtable;$(ProjectDir)"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ ProgramDataBaseFileName="$(IntDir)\zookeeper.pdb"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ws2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""
+ GenerateManifest="true"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="2"
+ UseOfMFC="0"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(ProjectDir)include;$(ProjectDir)generated;$(ProjectDir)hashtable;$(ProjectDir)"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ ProgramDataBaseFileName="$(IntDir)\zookeeper.pdb"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="WS2_32.lib"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\config.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\proto.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\recordio.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\winconfig.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\winport.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\winstdint.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zk_adaptor.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zk_hashtable.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\zookeeper.h"
+ >
+ </File>
+ <File
+ RelativePath=".\generated\zookeeper.jute.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\zookeeper_log.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\zookeeper_version.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\src\mt_adaptor.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\recordio.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\winport.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zk_hashtable.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zk_log.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zookeeper.c"
+ >
+ </File>
+ <File
+ RelativePath=".\generated\zookeeper.jute.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="hashtable"
+ >
+ <File
+ RelativePath=".\src\hashtable\hashtable.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\hashtable\hashtable.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\hashtable\hashtable_itr.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\hashtable\hashtable_itr.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\hashtable\hashtable_private.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\hashtable\LICENSE.txt"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="zookeeper"
+ ProjectGUID="{5754FB2B-5EA5-4988-851D-908CA533A626}"
+ RootNamespace="zookeeper"
+ Keyword="Win32Proj"
+ TargetFrameworkVersion="0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="2"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="$(ZOOKEEPER_HOME)\src\c\include;$(ZOOKEEPER_HOME)\src\c\generated;$(ZOOKEEPER_HOME)\src\c;$(ZOOKEEPER_HOME)\src\c\src\hashtable"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="4"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ws2_32.lib"
+ OutputFile="$(OutDir)\$(ProjectName).dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ ImportLibrary=".\Debug/zookeeper_d.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(ZOOKEEPER_HOME)\src\c\generated;$(ZOOKEEPER_HOME)\src\c;$(ZOOKEEPER_HOME)\src\c\include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ CompileAs="1"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="WS2_32.lib"
+ LinkIncremental="2"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\src\hashtable\hashtable.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\hashtable\hashtable_itr.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\hashtable\hashtable_private.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\proto.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\recordio.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\winconfig.h"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\src\winport.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\winstdint.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zk_adaptor.h"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zk_hashtable.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\zookeeper.h"
+ >
+ </File>
+ <File
+ RelativePath=".\generated\zookeeper.jute.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\zookeeper_log.h"
+ >
+ </File>
+ <File
+ RelativePath=".\include\zookeeper_version.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\src\hashtable\hashtable.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\hashtable\hashtable_itr.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\mt_adaptor.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\recordio.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\winport.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zk_hashtable.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zk_log.c"
+ >
+ </File>
+ <File
+ RelativePath=".\src\zookeeper.c"
+ >
+ </File>
+ <File
+ RelativePath=".\generated\zookeeper.jute.c"
+ >
+ </File>
+ </Filter>
+ <File
+ RelativePath=".\ClassDiagram1.cd"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java?rev=1148116&r1=1148115&r2=1148116&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/jute/compiler/JRecord.java Tue Jul 19 00:59:10 2011
@@ -183,7 +183,7 @@ public class JRecord extends JCompType {
c.write(" for(i=0;i<v->count;i++) {\n");
genSerialize(c, jvType, "data", "data[i]");
c.write(" }\n");
- c.write(" rc = rc ? : out->end_vector(out, tag);\n");
+ c.write(" rc = rc ? rc : out->end_vector(out, tag);\n");
c.write(" return rc;\n");
c.write("}\n");
c.write("int deserialize_" + struct_name + "(struct iarchive *in, const char *tag, struct " + struct_name + " *v)\n");
@@ -218,7 +218,7 @@ public class JRecord extends JCompType {
for(JField f : mFields) {
genSerialize(c, f.getType(), f.getTag(), f.getName());
}
- c.write(" rc = rc ? : out->end_record(out, tag);\n");
+ c.write(" rc = rc ? rc : out->end_record(out, tag);\n");
c.write(" return rc;\n");
c.write("}\n");
c.write("int deserialize_" + rec_name + "(struct iarchive *in, const char *tag, struct " + rec_name + "*v)");
@@ -228,7 +228,7 @@ public class JRecord extends JCompType {
for(JField f : mFields) {
genDeserialize(c, f.getType(), f.getTag(), f.getName());
}
- c.write(" rc = rc ? : in->end_record(in, tag);\n");
+ c.write(" rc = rc ? rc : in->end_record(in, tag);\n");
c.write(" return rc;\n");
c.write("}\n");
c.write("void deallocate_" + rec_name + "(struct " + rec_name + "*v)");
@@ -248,21 +248,21 @@ public class JRecord extends JCompType {
private void genSerialize(FileWriter c, JType type, String tag, String name) throws IOException {
if (type instanceof JRecord) {
- c.write(" rc = rc ? : serialize_" + extractStructName(type) + "(out, \"" + tag + "\", &v->" + name + ");\n");
+ c.write(" rc = rc ? rc : serialize_" + extractStructName(type) + "(out, \"" + tag + "\", &v->" + name + ");\n");
} else if (type instanceof JVector) {
- c.write(" rc = rc ? : serialize_" + JVector.extractVectorName(((JVector)type).getElementType()) + "(out, \"" + tag + "\", &v->" + name + ");\n");
+ c.write(" rc = rc ? rc : serialize_" + JVector.extractVectorName(((JVector)type).getElementType()) + "(out, \"" + tag + "\", &v->" + name + ");\n");
} else {
- c.write(" rc = rc ? : out->serialize_" + extractMethodSuffix(type) + "(out, \"" + tag + "\", &v->" + name + ");\n");
+ c.write(" rc = rc ? rc : out->serialize_" + extractMethodSuffix(type) + "(out, \"" + tag + "\", &v->" + name + ");\n");
}
}
private void genDeserialize(FileWriter c, JType type, String tag, String name) throws IOException {
if (type instanceof JRecord) {
- c.write(" rc = rc ? : deserialize_" + extractStructName(type) + "(in, \"" + tag + "\", &v->" + name + ");\n");
+ c.write(" rc = rc ? rc : deserialize_" + extractStructName(type) + "(in, \"" + tag + "\", &v->" + name + ");\n");
} else if (type instanceof JVector) {
- c.write(" rc = rc ? : deserialize_" + JVector.extractVectorName(((JVector)type).getElementType()) + "(in, \"" + tag + "\", &v->" + name + ");\n");
+ c.write(" rc = rc ? rc : deserialize_" + JVector.extractVectorName(((JVector)type).getElementType()) + "(in, \"" + tag + "\", &v->" + name + ");\n");
} else {
- c.write(" rc = rc ? : in->deserialize_" + extractMethodSuffix(type) + "(in, \"" + tag + "\", &v->" + name + ");\n");
+ c.write(" rc = rc ? rc : in->deserialize_" + extractMethodSuffix(type) + "(in, \"" + tag + "\", &v->" + name + ");\n");
}
}