Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2004-11-01 17:06:13 +0300
committerKent Mein <mein@cs.umn.edu>2004-11-01 17:06:13 +0300
commit4894785ed77899ba9246d6c45c78aaea6f654cdf (patch)
treef95d57c5941362055875567182698f5ad578374a /extern/solid/src
parent275c5e7ee346b1629b11d1eaa96550323ccb990a (diff)
Cast 0 as unsigned int for sun's CC to get rid of this:
"BP_ProxyList.h", line 60: Error: Cannot use std::pair<BP_Proxy*, int> to initialize std::pair<BP_Proxy*, unsigned>. Kent
Diffstat (limited to 'extern/solid/src')
-rwxr-xr-xextern/solid/src/broad/BP_ProxyList.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/solid/src/broad/BP_ProxyList.h b/extern/solid/src/broad/BP_ProxyList.h
index dde5693904a..2f449777d2d 100755
--- a/extern/solid/src/broad/BP_ProxyList.h
+++ b/extern/solid/src/broad/BP_ProxyList.h
@@ -45,7 +45,7 @@ public:
iterator add(BP_Proxy *proxy)
{
- BP_ProxyEntry entry = std::make_pair(proxy, 0);
+ BP_ProxyEntry entry = std::make_pair(proxy, (unsigned int)0);
iterator it = std::lower_bound(begin(), end(), entry);
if (it == end() || (*it).first != proxy)
{
@@ -57,7 +57,7 @@ public:
void remove(BP_Proxy *proxy)
{
- BP_ProxyEntry entry = std::make_pair(proxy, 0);
+ BP_ProxyEntry entry = std::make_pair(proxy, (unsigned int)0);
iterator it = std::lower_bound(begin(), end(), entry);
if (it != end() && (*it).first == proxy && --(*it).second == 0)
{