organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues1 Projects Releases Wiki Activity Actions2

ICU-4436 Allow RTTI to work when /OPT:ICF (COMDAT folding) is used.

Browse source 
X-SVN-Rev: 17333
This commit is contained in:
George Rhoten 2005-03-13 19:49:45 +00:00
parent fb1fce11f4
commit 7e191502de
8 changed files with 14 additions and 5 deletions

7
icu4c/source/common/common.vcproj
View file

@ -42,6 +42,7 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\icuuc33.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4a800000"
ImportLibrary="..\..\lib\icuuc.lib"/>
<Tool
@ -485,14 +486,16 @@
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
"
Outputs="..\..\include\unicode\$(InputFileName)"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode"
CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
"
Outputs="..\..\include\unicode\$(InputFileName)"/>
</FileConfiguration>
</File>

6
icu4c/source/common/unicode/uobject.h
View file

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 2002-2004, International Business Machines
* Copyright (C) 2002-2005, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -237,7 +237,7 @@ protected:
*/
#define UOBJECT_DEFINE_RTTI_IMPLEMENTATION(myClass) \
UClassID U_EXPORT2 myClass::getStaticClassID() { \
static const char classID = 0; \
static char classID = 0; \
return (UClassID)&classID; \
} \
UClassID myClass::getDynamicClassID() const \
@ -254,7 +254,7 @@ protected:
*/
#define UOBJECT_DEFINE_ABSTRACT_RTTI_IMPLEMENTATION(myClass) \
UClassID U_EXPORT2 myClass::getStaticClassID() { \
static const char classID = 0; \
static char classID = 0; \
return (UClassID)&classID; \
}

1
icu4c/source/i18n/i18n.vcproj
View file

@ -43,6 +43,7 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\icuin33.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4a900000"
ImportLibrary="..\..\lib\icuin.lib"/>
<Tool

1
icu4c/source/io/io.vcproj
View file

@ -43,6 +43,7 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\icuio33.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4ab00000"
ImportLibrary="..\..\lib\icuio.lib"/>
<Tool

1
icu4c/source/layout/layout.vcproj
View file

@ -109,6 +109,7 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\icule33.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4ac00000"
ImportLibrary="..\..\lib\icule.lib"/>
<Tool

1
icu4c/source/layoutex/layoutex.vcproj
View file

@ -41,6 +41,7 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\iculx33.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4ac80000"
ImportLibrary="..\..\lib\iculx.lib"/>
<Tool

1
icu4c/source/tools/ctestfw/ctestfw.vcproj
View file

@ -44,6 +44,7 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\..\lib\icutest.pdb"
EnableCOMDATFolding="2"
ImportLibrary=".\..\..\..\lib\icutest.lib"/>
<Tool
Name="VCMIDLTool"

1
icu4c/source/tools/toolutil/toolutil.vcproj
View file

@ -43,6 +43,7 @@
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\lib"
ProgramDatabaseFile=".\..\..\..\lib\icutu33.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4ac00000"
ImportLibrary="..\..\..\lib\icutu.lib"/>
<Tool