Changeset 5624 for source/ariba/overlay


Ignore:
Timestamp:
Aug 3, 2009, 2:29:12 PM (15 years ago)
Author:
Christoph Mayer
Message:

maemo segfault wegen static object ctors workaround

Location:
source/ariba/overlay
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • source/ariba/overlay/BaseOverlay.cpp

    r5554 r5624  
    654654        // find link descriptor. not found -> return unspecified
    655655        const LinkDescriptor* ld = getDescriptor(link);
    656         if (ld==NULL) return EndpointDescriptor::UNSPECIFIED;
     656        if (ld==NULL) return EndpointDescriptor::UNSPECIFIED();
    657657
    658658        // return endpoint-descriptor from base communication
    … …  
    670670        if( overlayInterface == NULL ) {
    671671                logging_error( "overlay interface not set, cannot resolve endpoint" );
    672                 return EndpointDescriptor::UNSPECIFIED;
     672                return EndpointDescriptor::UNSPECIFIED();
    673673        }
    674674

  • source/ariba/overlay/BaseOverlay.h

    r5556 r5624  
    269269         * @param boot A bootstrap node
    270270         */
    271         void joinSpoVNet(const SpoVNetID& id, const EndpointDescriptor& boot = EndpointDescriptor::UNSPECIFIED);
     271        void joinSpoVNet(const SpoVNetID& id, const EndpointDescriptor& boot = EndpointDescriptor::UNSPECIFIED());
    272272
    273273        /**

  • source/ariba/overlay/messages/JoinReply.h

    r5151 r5624  
    7171                const OverlayParameterSet _param = OverlayParameterSet::DEFAULT,
    7272                bool _joinAllowed = false,
    73                 const EndpointDescriptor _bootstrapEp = EndpointDescriptor::UNSPECIFIED
     73                const EndpointDescriptor _bootstrapEp = EndpointDescriptor::UNSPECIFIED()
    7474        );
    7575

  • source/ariba/overlay/modules/OverlayInterface.h

    r5316 r5624  
    103103         *    end-point, if this node is the initiator
    104104         */
    105         virtual void joinOverlay(const EndpointDescriptor& bootstrap =
    106                 EndpointDescriptor::UNSPECIFIED ) = 0;
     105        virtual void joinOverlay(const EndpointDescriptor& bootstrap = EndpointDescriptor::UNSPECIFIED()) = 0;
    107106
    108107        /**

  • source/ariba/overlay/modules/chord/Chord.cpp

    r5555 r5624  
    133133const EndpointDescriptor& Chord::resolveNode(const NodeID& node) {
    134134        const route_item* item = table->get(node);
    135         if (item == NULL || item->info.isUnspecified()) return EndpointDescriptor::UNSPECIFIED;
     135        if (item == NULL || item->info.isUnspecified()) return EndpointDescriptor::UNSPECIFIED();
    136136        return baseoverlay.getEndpointDescriptor(item->info);
    137137}

  • source/ariba/overlay/modules/chord/Chord.h

    r5316 r5624  
    104104        /// @see OverlayInterface.h
    105105        virtual void joinOverlay(
    106                 const EndpointDescriptor& boot = EndpointDescriptor::UNSPECIFIED
     106                const EndpointDescriptor& boot = EndpointDescriptor::UNSPECIFIED()
    107107        );
    108108

  • source/ariba/overlay/modules/onehop/OneHop.cpp

    r5316 r5624  
    7171
    7272        OverlayNodeMapping::const_iterator i = overlayNodes.find( node );
    73         if (i == overlayNodes.end()) return EndpointDescriptor::UNSPECIFIED;
     73        if (i == overlayNodes.end()) return EndpointDescriptor::UNSPECIFIED();
    7474
    7575        const EndpointDescriptor& ep = baseoverlay.getEndpointDescriptor( i->second );

  • source/ariba/overlay/modules/onehop/OneHop.h

    r5316 r5624  
    7272        /// @see OverlayInterface.h
    7373        virtual void joinOverlay(const EndpointDescriptor& boot =
    74                         EndpointDescriptor::UNSPECIFIED);
     74                        EndpointDescriptor::UNSPECIFIED());
    7575
    7676        /// @see OverlayInterface.h
Note: See TracChangeset for help on using the changeset viewer.