Changeset 23996

Show
Ignore:
Timestamp:
05.05.2011 13:38:33 (9 years ago)
Author:
jmt12
Message:

Altering some of the header includes to be more bulletproof and adding the executable to the list of ignored files

Location:
gs2-extensions/tdb-edit/trunk/src/src/txt2tdb-src
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/tdb-edit/trunk/src/src/txt2tdb-src

    • Property svn:ignore
      •  

        old new  
         1Makefile 
         2config.h 
        13config.log 
        24config.status 
        35stamp-h1 
        4 config.h 
        5 Makefile 
         6txt2tdb 
  • gs2-extensions/tdb-edit/trunk/src/src/txt2tdb-src/.svnignore

    r23994 r23996  
     1Makefile 
     2config.h 
    13config.log 
    24config.status 
    35stamp-h1 
    4 config.h 
    5 Makefile 
     6txt2tdb 
  • gs2-extensions/tdb-edit/trunk/src/src/txt2tdb-src/txt2tdb.cpp

    r23992 r23996  
    2626 **********************************************************************/ 
    2727 
    28 //#include <stdlib.h> 
    29 //#include <cstring> 
    30 //#include <fcntl.h> 
     28#if defined(GSDL_USE_OBJECTSPACE) 
     29#include <ospace\std\iostream> 
     30#elif defined(GSDL_USE_IOS_H) 
     31#include <iostream.h> 
     32#else 
    3133#include <iostream> 
    32  
    33 //#if defined(GSDL_USE_OBJECTSPACE) 
    34 //#  include <ospace\std\iostream> 
    35 //#elif defined(GSDL_USE_IOS_H) 
    36 //#  include <iostream.h> 
    37 //#else 
    38 //#  include <iostream> 
    39 //#endif 
     34#endif 
    4035 
    4136#include "tdb.h" 
    4237#include "text_t.h" 
    4338 
     39// use the standard namespace 
     40#if !defined (GSDL_NAMESPACE_BROKEN) 
     41#if defined(GSDL_USE_OBJECTSPACE) 
     42using namespace ospace::std; 
     43#else 
    4444using namespace std; 
     45#endif 
     46#endif 
    4547 
    4648void 
     
    7678    { 
    7779      cerr << argv[1] << " is not a valid option." << endl << endl; 
    78       printUsage (argv[0]); 
     80      printUsage(argv[0]); 
    7981      exit (0); 
    8082    }