github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-22 13:17:36 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.Core/ValueUtil.cpp: removed unnecessary compiler version checks

Browse source 
.Core/Socket.cpp: added compiler version check to #include <ws2ipdef.h>

git-svn-id: svn://ultimatepp.org/upp/trunk@4805 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
rylek 2012-04-18 08:40:47 +00:00
commit b000752005
3 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Socket.cpp
View file

@ -3,8 +3,10 @@
#ifdef PLATFORM_WIN32
#include <winsock2.h>
#ifdef COMPILER_MSC
#if defined(COMPILER_MSC) && _MSC_VER > 1310
#include <Ws2ipdef.h>
#endif
#endif
#include <Ws2tcpip.h>
#endif

28
uppsrc/Core/ValueUtil.cpp
View file

@ -35,29 +35,17 @@ bool ValueArray::Data::IsNull() const
void ValueArray::Data::Serialize(Stream& s)
{
#if !defined(_MSC_VER) || _MSC_VER > 1310
s % data;
#else
throw 0;
#endif
}
void ValueArray::Data::Jsonize(JsonIO& jio)
{
#if !defined(_MSC_VER) || _MSC_VER > 1310
Upp::Jsonize(jio, data);
#else
throw 0;
#endif
}
void ValueArray::Data::Xmlize(XmlIO& io)
{
#if !defined(_MSC_VER) || _MSC_VER > 1310
Upp::Xmlize(io, data);
#else
throw 0;
#endif
}
unsigned ValueArray::Data::GetHashValue() const
@ -200,11 +188,7 @@ ValueArray& ValueArray::operator=(const ValueArray& v) {
}
void ValueArray::SetCount(int n) {
#if !defined(_MSC_VER) || _MSC_VER > 1310
Clone().SetCount(n);
#else
throw 0;
#endif
}
void ValueArray::SetCount(int n, const Value& v)
@ -221,12 +205,8 @@ void ValueArray::Add(const Value& v) {
}
void ValueArray::Set(int i, const Value& v) {
#if !defined(_MSC_VER) || _MSC_VER > 1310
ASSERT(i >= 0);
Clone().At(i) = v;
#else
throw 0;
#endif
}
void ValueArray::Remove(int i, int count)
@ -268,21 +248,13 @@ bool ValueMap::Data::IsNull() const {
}
void ValueMap::Data::Serialize(Stream& s) {
#if !defined(_MSC_VER) || _MSC_VER > 1310
s % key % value;
#else
throw 0;
#endif
}
void ValueMap::Data::Xmlize(XmlIO& xio)
{
#if !defined(_MSC_VER) || _MSC_VER > 1310
Upp::Xmlize(xio, key);
Upp::Xmlize(xio, value);
#else
throw 0;
#endif
}
void ValueMap::Data::Jsonize(JsonIO& jio)

2
uppsrc/plugin/tif/init
View file

@ -1,7 +1,7 @@
#ifndef _plugin_tif_icpp_init_stub
#define _plugin_tif_icpp_init_stub
#include "plugin\jpg/init"
#define BLITZ_INDEX__ F0C7CE7C605666463896D90595BBCCCB8
#define BLITZ_INDEX__ F06a388f1e84b680d94787428bf67e5bb
#include "tifreg.icpp"
#undef BLITZ_INDEX__
#endif