Commit 8fa72ab1 authored by bfulgham@apple.com's avatar bfulgham@apple.com
Browse files

[Windows] Unreviewed build fix.

* WTF.vcxproj/WTF.vcxproj: Add missing SixCharacterHash.h,.cpp files.
* WTF.vcxproj/WTF.vcxproj.filters: Ditto.
* wtf/NumberOfCores.h: Add export macro to numberOfProcessorCores.
* wtf/PrintStream.h: Add export macro to dumpCharacter.
* wtf/SixCharacterHash.h: Add export macro to sixCharacterHashStringToInteger
and integerToSixCharacterHashString.
* wtf/text/CString.h: Add export macro to hash and equal methods.
(WTF::CStringHash::hash): Add export macro.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153358 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b987aae6
2013-07-25 Brent Fulgham <bfulgham@apple.com>
[Windows] Unreviewed build fix.
* WTF.vcxproj/WTF.vcxproj: Add missing SixCharacterHash.h,.cpp files.
* WTF.vcxproj/WTF.vcxproj.filters: Ditto.
* wtf/NumberOfCores.h: Add export macro to numberOfProcessorCores.
* wtf/PrintStream.h: Add export macro to dumpCharacter.
* wtf/SixCharacterHash.h: Add export macro to sixCharacterHashStringToInteger
and integerToSixCharacterHashString.
* wtf/text/CString.h: Add export macro to hash and equal methods.
(WTF::CStringHash::hash): Add export macro.
2013-07-25 peavo@outlook.com <peavo@outlook.com>
 
[Windows] Provide ASM implemenation of 8-bit compare-and-swap
......
......@@ -92,6 +92,7 @@
<ClCompile Include="..\wtf\RandomNumber.cpp" />
<ClCompile Include="..\wtf\RefCountedLeakCounter.cpp" />
<ClCompile Include="..\wtf\SHA1.cpp" />
<ClCompile Include="..\wtf\SixCharacterHash.cpp" />
<ClCompile Include="..\wtf\SizeLimits.cpp" />
<ClCompile Include="..\wtf\StackBounds.cpp" />
<ClCompile Include="..\wtf\StringPrintStream.cpp" />
......@@ -235,6 +236,7 @@
<ClInclude Include="..\wtf\SentinelLinkedList.h" />
<ClInclude Include="..\wtf\SHA1.h" />
<ClInclude Include="..\wtf\SinglyLinkedList.h" />
<ClInclude Include="..\wtf\SixCharacterHash.h" />
<ClInclude Include="..\wtf\StackBounds.h" />
<ClInclude Include="..\wtf\StaticConstructors.h" />
<ClInclude Include="..\wtf\StdLibExtras.h" />
......
......@@ -222,6 +222,9 @@
<ClCompile Include="..\wtf\CompilationThread.cpp">
<Filter>wtf</Filter>
</ClCompile>
<ClCompile Include="..\wtf\SixCharacterHash.cpp">
<Filter>wtf</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\wtf\dtoa\utils.h">
......@@ -711,6 +714,9 @@
<ClInclude Include="..\wtf\CompilationThread.h">
<Filter>wtf</Filter>
</ClInclude>
<ClInclude Include="..\wtf\SixCharacterHash.h">
<Filter>wtf</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="WTFPostBuild.cmd" />
......
......@@ -23,7 +23,7 @@
namespace WTF {
int numberOfProcessorCores();
WTF_EXPORT_PRIVATE int numberOfProcessorCores();
}
......
......@@ -310,7 +310,7 @@ void printInternal(PrintStream& out, const T& value)
// Use an adaptor-based dumper for characters to avoid situations where
// you've "compressed" an integer to a character and it ends up printing
// as ASCII when you wanted it to print as a number.
void dumpCharacter(PrintStream&, char);
WTF_EXPORT_PRIVATE void dumpCharacter(PrintStream&, char);
MAKE_PRINT_ADAPTOR(CharacterDump, char, dumpCharacter);
template<typename T>
......
......@@ -33,11 +33,11 @@ namespace WTF {
// Takes a six-character string that encodes a 32-bit integer, and returns that
// integer. RELEASE_ASSERT's that the string represents a valid six-character
// hash.
unsigned sixCharacterHashStringToInteger(const char*);
WTF_EXPORT_PRIVATE unsigned sixCharacterHashStringToInteger(const char*);
// Takes a 32-bit integer and constructs a six-character string that contains
// the character hash.
FixedArray<char, 7> integerToSixCharacterHashString(unsigned);
WTF_EXPORT_PRIVATE FixedArray<char, 7> integerToSixCharacterHashString(unsigned);
} // namespace WTF
......
......@@ -81,7 +81,7 @@ public:
bool isHashTableDeletedValue() const { return m_buffer.isHashTableDeletedValue(); }
unsigned hash() const;
WTF_EXPORT_PRIVATE unsigned hash() const;
private:
void copyBufferIfNeeded();
......@@ -96,8 +96,8 @@ inline bool operator!=(const CString& a, const char* b) { return !(a == b); }
bool operator<(const CString& a, const CString& b);
struct CStringHash {
static unsigned hash(const CString& string) { return string.hash(); }
static bool equal(const CString& a, const CString& b);
WTF_EXPORT_PRIVATE static unsigned hash(const CString& string) { return string.hash(); }
WTF_EXPORT_PRIVATE static bool equal(const CString& a, const CString& b);
static const bool safeToCompareToEmptyOrDeleted = true;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment