Changeset 509

Show
Ignore:
Timestamp:
08/30/05 11:52:28 (8 years ago)
Author:
max
Message:

finishing windows omniorb commit - apparently i'd forgotten to commit a few of the files.

Location:
ossie/trunk/ossie/include/ossie
Files:
21 modified

Legend:

Unmodified
Added
Removed

  • ossie/trunk/ossie/include/ossie/ApplicationFactory_impl.h

    r463 r509  
    2323#ifndef APPLICATIONFACTORY_H 
    2424#define APPLICATIONFACTORY_H 
     25 
     26#ifndef __linux__ 
     27#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     28#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     29#pragma warning( disable : 4251 ) // this is for dll interfaces 
     30#endif 
    2531 
    2632#include "ossiecf.h" 

  • ossie/trunk/ossie/include/ossie/ComponentAssemblyParser.h

    r397 r509  
    2828#define COMPONENTASSEMBLYPARSER_H 
    2929 
     30#ifndef __linux__ 
     31#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     32#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     33#pragma warning( disable : 4251 ) // this is for dll interfaces 
     34#endif 
     35 
    3036#include "ossie/Connection.h" 
    3137#include <vector> 
    … …  
    3844 
    3945        char* name;                               // the name of the root node 
    40         DOMDocument* doc; 
     46        XERCES_CPP_NAMESPACE::DOMDocument* doc; 
    4147        std::vector <Connection*> connections; 
    4248        void parseIdAndName(DOMElement* _root); 

  • ossie/trunk/ossie/include/ossie/ComponentInstantiation.h

    r397 r509  
    2727#ifndef COMPONENTINSTANTIATION_H 
    2828#define COMPONENTINSTANTIATION_H 
     29 
     30#ifndef __linux__ 
     31#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     32#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     33#pragma warning( disable : 4251 ) // this is for dll interfaces 
     34#endif 
    2935 
    3036#include "InstantiationProperty.h" 

  • ossie/trunk/ossie/include/ossie/ComponentPlacement.h

    r397 r509  
    2828#define COMPONENTPLACEMENT_H 
    2929 
     30#ifndef __linux__ 
     31#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     32#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     33#pragma warning( disable : 4251 ) // this is for dll interfaces 
     34#endif 
     35 
    3036#include "ComponentInstantiation.h" 
    3137 
    … …  
    3339{ 
    3440protected: 
    35         DOMDocument*    doc; 
     41        XERCES_CPP_NAMESPACE::DOMDocument*      doc; 
    3642        DOMElement*     root; 
    3743        char*           SPDFile; 
    … …  
    4854public: 
    4955        ComponentPlacement(); 
    50         ComponentPlacement(DOMElement * _element, DOMDocument * _doc); 
     56        ComponentPlacement(DOMElement * _element, XERCES_CPP_NAMESPACE::DOMDocument * _doc); 
    5157        ComponentPlacement(const ComponentPlacement & _CP); 
    5258        virtual ~ComponentPlacement(); 

  • ossie/trunk/ossie/include/ossie/DCDComponentPlacement.h

    r397 r509  
    5454public: 
    5555        DCDComponentPlacement(); 
    56         DCDComponentPlacement(DOMElement*  _elem, DOMDocument*  _doc); 
     56        DCDComponentPlacement(DOMElement*  _elem, XERCES_CPP_NAMESPACE::DOMDocument*  _doc); 
    5757        DCDComponentPlacement(const DCDComponentPlacement & _dcdCP); 
    5858        ~DCDComponentPlacement(); 

  • ossie/trunk/ossie/include/ossie/DMDParser.h

    r397 r509  
    4040{ 
    4141private: 
    42         DOMDocument* doc; 
     42        XERCES_CPP_NAMESPACE::DOMDocument* doc; 
    4343        XercesDOMParser* parser; 
    4444        char* DMDFile; 

  • ossie/trunk/ossie/include/ossie/Device_impl.h

    r397 r509  
    2323#ifndef DEVICE_IMPL_H 
    2424#define DEVICE_IMPL_H 
     25 
     26#ifndef __linux__ 
     27#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     28#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     29#pragma warning( disable : 4251 ) // this is for dll interfaces 
     30#endif 
    2531 
    2632#include "Resource_impl.h" 

  • ossie/trunk/ossie/include/ossie/DomainManager_impl.h

    r461 r509  
    2424#define __DOMAINMANAGER_IMPL__ 
    2525 
     26 
     27#ifndef __linux__ 
     28#pragma warning( disable : 4290 )       // there's an annoying VC7 warning that I wanted to make go away 
     29#endif 
    2630 
    2731#include "CosEventComm.hh" 

  • ossie/trunk/ossie/include/ossie/FileManager_impl.h

    r397 r509  
    2525 
    2626#include "ossiecf.h" 
     27 
     28#ifndef __linux__ 
     29#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     30#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     31#pragma warning( disable : 4251 ) // this is for dll interfaces 
     32#endif 
    2733 
    2834#include "FileSystem_impl.h" 

  • ossie/trunk/ossie/include/ossie/File_impl.h

    r501 r509  
    3030 
    3131#include <omniORB4/CORBA.h> 
     32 
     33#ifndef __linux__ 
     34#pragma warning( disable : 4275 )       // there's an annoying VC7 warning that I wanted to make go away 
     35#pragma warning( disable : 4290 ) 
     36#endif 
    3237 
    3338#include "cf.h" 

  • ossie/trunk/ossie/include/ossie/LifeCycle_impl.h

    r397 r509  
    2626#include "ossiecf.h" 
    2727 
     28#ifndef __linux__ 
     29#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     30#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     31#pragma warning( disable : 4251 ) // this is for dll interfaces 
     32#endif 
     33 
    2834#include "cf.h" 
    2935 

  • ossie/trunk/ossie/include/ossie/PRFParser.h

    r397 r509  
    3636private: 
    3737        char *propertyFile; 
    38         DOMDocument *doc; 
     38        XERCES_CPP_NAMESPACE::DOMDocument *doc; 
    3939        XercesDOMParser *parser; 
    4040        PRFProperty configProperties; 

  • ossie/trunk/ossie/include/ossie/PortSupplier_impl.h

    r397 r509  
    2424#define PORTSUPPLIER_IMPL_H 
    2525 
     26#ifndef __linux__ 
     27#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     28#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     29#pragma warning( disable : 4251 ) // this is for dll interfaces 
     30#endif 
     31 
    2632#include "ossiecf.h" 
    2733 

  • ossie/trunk/ossie/include/ossie/PropertySet_impl.h

    r397 r509  
    2828#include "cf.h" 
    2929 
     30#ifndef __linux__ 
     31#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     32#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     33#pragma warning( disable : 4251 ) // this is for dll interfaces 
     34#endif 
    3035 
    3136#include <vector> 

  • ossie/trunk/ossie/include/ossie/SADComponentPlacement.h

    r397 r509  
    4747public: 
    4848        SADComponentPlacement(); 
    49         SADComponentPlacement(DOMElement*  _elem, DOMDocument*  _doc); 
     49        SADComponentPlacement(DOMElement*  _elem, XERCES_CPP_NAMESPACE::DOMDocument*  _doc); 
    5050        ~SADComponentPlacement(); 
    5151 

  • ossie/trunk/ossie/include/ossie/SCDParser.h

    r397 r509  
    4040{ 
    4141private: 
    42         DOMDocument* doc; 
     42        XERCES_CPP_NAMESPACE::DOMDocument* doc; 
    4343        XercesDOMParser* parser; 
    4444        char* componentType; 

  • ossie/trunk/ossie/include/ossie/SPDImplementation.h

    r397 r509  
    2727#ifndef SPDIMPLEMENTATION_H 
    2828#define SPDIMPLEMENTATION_H 
     29 
     30#ifndef __linux__ 
     31#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     32#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     33#pragma warning( disable : 4251 ) // this is for dll interfaces 
     34#endif 
    2935 
    3036#include "SPDUsesDevice.h" 

  • ossie/trunk/ossie/include/ossie/SPDParser.h

    r397 r509  
    2828#define SPDPARSER_H 
    2929 
     30#ifndef __linux__ 
     31#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     32#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     33#pragma warning( disable : 4251 ) // this is for dll interfaces 
     34#endif 
     35 
    3036#include "SPDAuthor.h" 
    3137#include "SPDUsesDevice.h" 
    … …  
    4046{ 
    4147protected: 
    42         DOMDocument*  doc; 
     48        XERCES_CPP_NAMESPACE::DOMDocument*  doc; 
    4349 
    4450        XercesDOMParser* parser; 

  • ossie/trunk/ossie/include/ossie/SPDUsesDevice.h

    r397 r509  
    2828#define SPDUSESDEVICE_H 
    2929 
     30#ifndef __linux__ 
     31#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     32#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     33#pragma warning( disable : 4251 ) // this is for dll interfaces 
     34#endif 
     35 
    3036#include "ossieparser.h"        // ossieparser 
    3137 

  • ossie/trunk/ossie/include/ossie/TestableObject_impl.h

    r397 r509  
    2424#define TESTABLEOBJECT_IMPL_H 
    2525 
     26#ifndef __linux__ 
     27#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     28#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     29#pragma warning( disable : 4251 ) // this is for dll interfaces 
     30#endif 
     31 
    2632#include "ossiecf.h" 
    2733 

  • ossie/trunk/ossie/include/ossie/orb_wrap.h

    r397 r509  
    3131 
    3232#include "omniORB4/CORBA.h" 
     33 
     34#include <iostream> 
    3335//#include "orbsvcs/CosNamingC.h" 
    3436//#include "PortableServer/PortableServer.h" 
     37 
     38#ifndef __linux__ 
     39#pragma warning( disable : 4275 ) // this could be something but i'm not sure    
     40#pragma warning( disable : 4290 ) // there's an annoying VC7 warning that I wanted to make go away 
     41#pragma warning( disable : 4251 ) // this is for dll interfaces 
     42#endif 
    3543 
    3644using namespace std;