Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 581280 Details for
Bug 817684
building against ice requires -fpermissive
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
patches from arch linux
ice-3.4.2-arch.patch (text/plain), 11.74 KB, created by
Matthew Woehlke
on 2012-04-30 21:06:08 UTC
(
hide
)
Description:
patches from arch linux
Filename:
MIME Type:
Creator:
Matthew Woehlke
Created:
2012-04-30 21:06:08 UTC
Size:
11.74 KB
patch
obsolete
>diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h >index d8ef692..901b3bc 100644 >--- a/cpp/include/Freeze/Map.h >+++ b/cpp/include/Freeze/Map.h >@@ -426,7 +426,7 @@ public: > > ConstIterator(MapHelper& mapHelper, const Ice::CommunicatorPtr& communicator) : > _helper(IteratorHelper::create(mapHelper, true)), >- _communicator(_communicator), >+ _communicator(communicator), > _refValid(false) > { > } >diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h >index 9501f08..8679d03 100644 >--- a/cpp/include/Ice/Buffer.h >+++ b/cpp/include/Ice/Buffer.h >@@ -10,6 +10,7 @@ > #ifndef ICEE_BUFFER_H > #define ICEE_BUFFER_H > >+#include <cstddef> > #include <Ice/Config.h> > > #include <cstddef> >diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h >index 7cf37e8..a03497a 100644 >--- a/cpp/include/Ice/Proxy.h >+++ b/cpp/include/Ice/Proxy.h >@@ -1171,7 +1171,7 @@ public: > > TwowayCallbackNC(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : CallbackNC<T>(instance, excb, sentcb) > { >- checkCallback(instance, cb || excb != 0); >+ this->checkCallback(instance, cb || excb != 0); > } > }; > >@@ -1187,7 +1187,7 @@ public: > > TwowayCallback(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : Callback<T, CT>(instance, excb, sentcb) > { >- checkCallback(instance, cb || excb != 0); >+ this->checkCallback(instance, cb || excb != 0); > } > }; > >@@ -1208,7 +1208,7 @@ public: > OnewayCallbackNC(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : > CallbackNC<T>(instance, excb, sentcb), response(cb) > { >- checkCallback(instance, cb != 0 || excb != 0); >+ this->checkCallback(instance, cb != 0 || excb != 0); > } > > virtual void __completed(const ::Ice::AsyncResultPtr& result) const >@@ -1253,7 +1253,7 @@ public: > OnewayCallback(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : > Callback<T, CT>(instance, excb, sentcb), response(cb) > { >- checkCallback(instance, cb != 0 || excb != 0); >+ this->checkCallback(instance, cb != 0 || excb != 0); > } > > virtual void __completed(const ::Ice::AsyncResultPtr& result) const >diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h >index 40cd611..36ab56b 100644 >--- a/cpp/include/Ice/Stream.h >+++ b/cpp/include/Ice/Stream.h >@@ -17,6 +17,12 @@ > #include <Ice/Proxy.h> > #include <IceUtil/Shared.h> > >+namespace IceInternal >+{ >+ // Forward declaration required for writer specializations. >+ void delegateThrowMarshalException(const char*, int, const ::std::string&); >+} >+ > namespace Ice > { > >@@ -45,9 +51,6 @@ enum StreamTraitType > StreamTraitTypeUnknown > }; > >-// Forward declaration required for writer specializations. >-class MarshalException; >- > // > // Base trait template. This doesn't actually do anything -- we just > // use it as a template that we can specialize. >@@ -542,7 +545,7 @@ struct StreamWriter<StreamTraitTypeByteEnum> > { > if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit) > { >- throw MarshalException(__FILE__, __LINE__, "enumerator out of range"); >+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range"); > } > outS->write(static_cast<Byte>(v)); > } >@@ -558,7 +561,7 @@ struct StreamReader<StreamTraitTypeByteEnum> > inS->read(val); > if(val > StreamTrait<T>::enumLimit) > { >- throw MarshalException(__FILE__, __LINE__, "enumerator out of range"); >+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range"); > } > v = static_cast<T>(val); > } >@@ -573,7 +576,7 @@ struct StreamWriter<StreamTraitTypeShortEnum> > { > if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit) > { >- throw MarshalException(__FILE__, __LINE__, "enumerator out of range"); >+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range"); > } > outS->write(static_cast<Short>(v)); > } >@@ -589,7 +592,7 @@ struct StreamReader<StreamTraitTypeShortEnum> > inS->read(val); > if(val < 0 || val > StreamTrait<T>::enumLimit) > { >- throw MarshalException(__FILE__, __LINE__, "enumerator out of range"); >+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range"); > } > v = static_cast<T>(val); > } >@@ -603,7 +606,7 @@ struct StreamWriter<StreamTraitTypeIntEnum> > { > if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit) > { >- throw MarshalException(__FILE__, __LINE__, "enumerator out of range"); >+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range"); > } > outS->write(static_cast<Int>(v)); > } >@@ -619,7 +622,7 @@ struct StreamReader<StreamTraitTypeIntEnum> > inS->read(val); > if(val < 0 || val > StreamTrait<T>::enumLimit) > { >- throw MarshalException(__FILE__, __LINE__, "enumerator out of range"); >+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range"); > } > v = static_cast<T>(val); > } >diff --git a/cpp/src/Ice/Stream.cpp b/cpp/src/Ice/Stream.cpp >index 55f984d..2ecdc08 100644 >--- a/cpp/src/Ice/Stream.cpp >+++ b/cpp/src/Ice/Stream.cpp >@@ -8,6 +8,7 @@ > // ********************************************************************** > > #include <Ice/Stream.h> >+#include <Ice/LocalException.h> > > using namespace std; > using namespace Ice; >@@ -15,3 +16,11 @@ using namespace IceInternal; > > IceUtil::Shared* Ice::upCast(InputStream* p) { return p; } > IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; } >+ >+namespace IceInternal >+{ >+ void delegateThrowMarshalException(const char* file, int line , const ::std::string& message) >+ { >+ throw Ice::MarshalException(file, line, message); >+ } >+} >diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp >index 9126c2f..0bc0111 100644 >--- a/cpp/src/IceGrid/DescriptorHelper.cpp >+++ b/cpp/src/IceGrid/DescriptorHelper.cpp >@@ -198,15 +198,6 @@ updateSeqElts(const Seq& seq, const Seq& update, const Ice::StringSeq& remove, G > return result; > } > >-template<typename Dict> Dict >-getDictUpdatedElts(const Dict& ldict, const Dict& rdict) >-{ >-#if defined(_MSC_VER) && (_MSC_VER < 1300) >- return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>()); >-#else >- return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>()); >-#endif >-} > > template<typename EqFunc, typename Dict> Dict > getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq) >@@ -223,6 +214,16 @@ getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq) > return result; > } > >+template<typename Dict> Dict >+getDictUpdatedElts(const Dict& ldict, const Dict& rdict) >+{ >+#if defined(_MSC_VER) && (_MSC_VER < 1300) >+ return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>()); >+#else >+ return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>()); >+#endif >+} >+ > template <typename Dict> Ice::StringSeq > getDictRemovedElts(const Dict& ldict, const Dict& rdict) > { >diff --git a/cpp/src/IceGrid/ReplicaCache.cpp b/cpp/src/IceGrid/ReplicaCache.cpp >index 53ad03e..154853d 100644 >--- a/cpp/src/IceGrid/ReplicaCache.cpp >+++ b/cpp/src/IceGrid/ReplicaCache.cpp >@@ -40,7 +40,7 @@ ReplicaCache::add(const string& name, const ReplicaSessionIPtr& session) > Lock sync(*this); > > ReplicaEntryPtr entry; >- while(entry = getImpl(name)) >+ while((entry = getImpl(name))) > { > ReplicaSessionIPtr session = entry->getSession(); > if(session->isDestroyed()) >diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h >index 3c67e20..f5c1b2e 100644 >--- a/cpp/src/IceGrid/SessionI.h >+++ b/cpp/src/IceGrid/SessionI.h >@@ -35,7 +35,7 @@ typedef IceUtil::Handle<Allocatable> AllocatablePtr; > class SessionI; > typedef IceUtil::Handle<SessionI> SessionIPtr; > >-class BaseSessionI : virtual Ice::Object, public IceUtil::Mutex >+class BaseSessionI : virtual public Ice::Object, public IceUtil::Mutex > { > public: > >diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp >index 0c9511e..b9788f4 100644 >--- a/cpp/src/IceStorm/NodeI.cpp >+++ b/cpp/src/IceStorm/NodeI.cpp >@@ -18,11 +18,6 @@ using namespace std; > namespace > { > >-bool operator==(const GroupNodeInfo& info, int id) >-{ >- return info.id == id; >-} >- > class CheckTask : public IceUtil::TimerTask > { > const NodeIPtr _node; >diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp >index 90d3136..dd5cf4f 100644 >--- a/cpp/src/slice2cs/Gen.cpp >+++ b/cpp/src/slice2cs/Gen.cpp >@@ -1281,7 +1281,7 @@ Slice::CsVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePt > { > _out << value << "F"; > } >- else if(ep = EnumPtr::dynamicCast(type)) >+ else if((ep = EnumPtr::dynamicCast(type))) > { > string enumName = fixId(ep->scoped()); > string::size_type colon = value.rfind(':'); >@@ -3914,16 +3914,6 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) > ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container()); > string name = fixId(p->name(), DotNet::ICloneable, true); > vector<string> params = getParams(p); >- bool hasOutParams = false; >- ParamDeclList paramList = p->parameters(); >- for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli) >- { >- if((*pli)->isOutParam()) >- { >- hasOutParams = true; >- break; >- } >- } > > _out << sp; > >diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp >index e0ac391..5dd7226 100644 >--- a/cpp/src/slice2java/Gen.cpp >+++ b/cpp/src/slice2java/Gen.cpp >@@ -1246,7 +1246,7 @@ Slice::JavaVisitor::writeConstantValue(Output& out, const TypePtr& type, const S > { > BuiltinPtr bp; > EnumPtr ep; >- if(bp = BuiltinPtr::dynamicCast(type)) >+ if((bp = BuiltinPtr::dynamicCast(type))) > { > switch(bp->kind()) > { >@@ -1349,7 +1349,7 @@ Slice::JavaVisitor::writeConstantValue(Output& out, const TypePtr& type, const S > } > > } >- else if(ep = EnumPtr::dynamicCast(type)) >+ else if((ep = EnumPtr::dynamicCast(type))) > { > string val = value; > string::size_type pos = val.rfind(':'); >diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp >index 4fb14f5..9982cc6 100644 >--- a/cpp/test/Glacier2/ssl/Server.cpp >+++ b/cpp/test/Glacier2/ssl/Server.cpp >@@ -99,7 +99,7 @@ public: > } > > virtual void >- ice_ping(const Ice::Current& current) >+ ice_ping(const Ice::Current& current) const > { > testContext(_ssl, current.ctx); > } >diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h >index f38a280..4d35f7d 100644 >--- a/cpp/test/Ice/background/EndpointI.h >+++ b/cpp/test/Ice/background/EndpointI.h >@@ -48,7 +48,7 @@ protected: > > virtual Ice::Int hashInit() const; > #if !defined(_MSC_VER) || _MSC_VER > 1300 >- using IceInternal::EndpointI::connectors; >+ using ::IceInternal::EndpointI::connectors; > #endif > > private: >diff --git a/cpp/test/Ice/properties/run.py b/cpp/test/Ice/properties/run.py >index 18f78f0..955295e 100755 >--- a/cpp/test/Ice/properties/run.py >+++ b/cpp/test/Ice/properties/run.py >@@ -26,7 +26,7 @@ client = os.path.join(os.getcwd(), "client") > # > # Write config > # >-configPath = u"./config/ä¸å½_client.config" >+configPath = u"./config/ä¸å½_client.config".encode("utf-8") > > TestUtil.createConfig(configPath, > ["# Automatically generated by Ice test driver.",
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 817684
: 581280