From: Pierre V. <pi...@us...> - 2004-05-22 13:17:14
|
Update of /cvsroot/okernel/nrtl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19385 Modified Files: nrtl.h knetobject.cpp Added Files: nrtl.vcproj Log Message: [pive] Visual Studio .NET (VC 7.0) support for jayaRTL and OKernel. --- NEW FILE: nrtl.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="nrtl" ProjectGUID="{91EA0B2D-D444-4D54-9286-ACEAFA506527}" SccProjectName="" SccLocalPath=""> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Release Unicode|Win32" OutputDirectory=".\Obj_Release_Unicode" IntermediateDirectory=".\Obj_Release_Unicode" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/vmg" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,jayartl" PreprocessorDefinitions="NDEBUG;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Obj_Release_Unicode/nrtl.pch" AssemblerListingLocation=".\Obj_Release_Unicode/" ObjectFile=".\Obj_Release_Unicode/" ProgramDataBaseFileName=".\Obj_Release_Unicode/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile="Obj_Release_Unicode/nrtluni.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ProgramDatabaseFile=".\Obj_Release_Unicode/nrtluni.pdb" SubSystem="2" ImportLibrary=".\Obj_Release_Unicode/nrtluni.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Obj_Release_Unicode/nrtl.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool" Description="release unicode" CommandLine="relu.bat"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1047" AdditionalIncludeDirectories="\nrtl\inc"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug|Win32" OutputDirectory=".\Obj_Debug" IntermediateDirectory=".\Obj_Debug" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/vmg" Optimization="0" AdditionalIncludeDirectories=".,jayartl" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK" ExceptionHandling="TRUE" RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Obj_Debug/nrtl.pch" AssemblerListingLocation=".\Obj_Debug/" ObjectFile=".\Obj_Debug/" ProgramDataBaseFileName=".\Obj_Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile=".\Obj_Debug/nrtl.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Obj_Debug/nrtl.pdb" SubSystem="2" ImportLibrary=".\Obj_Debug/nrtl.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Obj_Debug/nrtl.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool" Description="debug" CommandLine="deb.bat"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1047" AdditionalIncludeDirectories="\nrtl\inc"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Debug Unicode|Win32" OutputDirectory=".\Obj_Debug_Unicode" IntermediateDirectory=".\Obj_Debug_Unicode" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="1"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/vmg" Optimization="0" AdditionalIncludeDirectories=".,jayartl" PreprocessorDefinitions="_DEBUG;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK" RuntimeLibrary="3" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Obj_Debug_Unicode/nrtl.pch" AssemblerListingLocation=".\Obj_Debug_Unicode/" ObjectFile=".\Obj_Debug_Unicode/" ProgramDataBaseFileName=".\Obj_Debug_Unicode/" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile="Obj_Debug_Unicode/nrtluni.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Obj_Debug_Unicode/nrtluni.pdb" SubSystem="2" ImportLibrary=".\Obj_Debug_Unicode/nrtluni.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="_DEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Obj_Debug_Unicode/nrtl.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool" Description="debug unicode" CommandLine="debu.bat"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1047" AdditionalIncludeDirectories="\nrtl\inc"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory=".\Obj_Release" IntermediateDirectory=".\Obj_Release" ConfigurationType="2" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" AdditionalOptions="/vmg" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories=".,jayartl" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" PrecompiledHeaderFile=".\Obj_Release/nrtl.pch" AssemblerListingLocation=".\Obj_Release/" ObjectFile=".\Obj_Release/" ProgramDataBaseFileName=".\Obj_Release/" WarningLevel="3" SuppressStartupBanner="TRUE" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" OutputFile=".\Obj_Release/nrtl.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" ProgramDatabaseFile=".\Obj_Release/nrtl.pdb" SubSystem="2" ImportLibrary=".\Obj_Release/nrtl.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool" PreprocessorDefinitions="NDEBUG" MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" TypeLibraryName=".\Obj_Release/nrtl.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool" Description="release" CommandLine="rel.bat"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1047" AdditionalIncludeDirectories="\nrtl\inc"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCWebDeploymentTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="*.cpp"> <File RelativePath="dllmain.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="jayartl\jayartl.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="kbitv.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="kbuffer.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="kclass.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="klist.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="knetobject.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="ksmall.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="ktab.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> <File RelativePath="ktree.cpp"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="_DEBUG;_UNICODE;UNICODE;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;JAYARTL_INTERNAL;JAYARTL_STANDARDMEM;NTRL_NETWORK;$(NoInherit)"/> </FileConfiguration> </File> </Filter> <Filter Name="Resource Files" Filter="*.rc"> <File RelativePath="nrtl.rc"> <FileConfiguration Name="Release Unicode|Win32"> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG;$(NoInherit)" AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration Name="Debug|Win32"> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="" AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration Name="Debug Unicode|Win32"> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG;$(NoInherit)" AdditionalIncludeDirectories=""/> </FileConfiguration> <FileConfiguration Name="Release|Win32"> <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="" AdditionalIncludeDirectories=""/> </FileConfiguration> </File> </Filter> <File RelativePath="changelog.txt"> </File> <File RelativePath="copying.txt"> </File> <File RelativePath="todo.txt"> </File> </Files> <Globals> </Globals> </VisualStudioProject> Index: knetobject.cpp =================================================================== RCS file: /cvsroot/okernel/nrtl/knetobject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** knetobject.cpp 14 May 2003 22:46:12 -0000 1.2 --- knetobject.cpp 22 May 2004 13:17:04 -0000 1.3 *************** *** 47,50 **** --- 47,51 ---- History Rev Description 051403 dgil Wrote it from scratch + 052204 pive MSVC7 iostream compatibilty and free/delete warning issue ============================================================================ */ *************** *** 71,74 **** --- 72,84 ---- } + + #if _MSC_VER >= 1300 + void Buffer::operator delete(jpointer p, size_t us) + { + JAYA_ASSERTION(p!=NULL,"p is NULL ?"); + JAYA_FREE(p); + } + #endif /* _MSC_VER */ + // =========================================================================== // Constructors and destructors Index: nrtl.h =================================================================== RCS file: /cvsroot/okernel/nrtl/nrtl.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** nrtl.h 14 May 2003 22:46:12 -0000 1.7 --- nrtl.h 22 May 2004 13:17:04 -0000 1.8 *************** *** 63,66 **** --- 63,67 ---- ... 112402 dgil Change license to MPL/GPL/LGPL + 052204 pive MSVC7 iostream compatibilty and free/delete warning issue ============================================================================ */ *************** *** 72,79 **** // =========================================================================== ! #define NRTL_HEADER_RELEASE_05142003 #define NTRL_MAJOR_VERSION 4 ! #define NTRL_MINOR_VERSION 0 // =========================================================================== --- 73,80 ---- // =========================================================================== ! #define NRTL_HEADER_RELEASE_05222004 #define NTRL_MAJOR_VERSION 4 ! #define NTRL_MINOR_VERSION 1 // =========================================================================== *************** *** 111,115 **** --- 112,121 ---- #define SZKEY_OEM TEXT("\\Nunki") + #if _MSC_VER >= 1300 + #include <iostream> + using namespace std; + #else #include <iostream.h> + #endif #if defined(__NRTL_OKERNEL_INTERNAL) *************** *** 233,237 **** jpointer operator new(size_t cs, size_t ss = 0); ! void resize(size_t asize); --- 239,245 ---- jpointer operator new(size_t cs, size_t ss = 0); ! #if _MSC_VER >= 1300 ! void operator delete(jpointer, size_t); ! #endif /* _MSC_VER */ void resize(size_t asize); |