diff options
Diffstat (limited to 'cpp')
399 files changed, 2275 insertions, 1104 deletions
diff --git a/cpp/INSTALL.SOLARIS b/cpp/INSTALL.SOLARIS index dfaf780dd8e..fdc86236fdc 100644 --- a/cpp/INSTALL.SOLARIS +++ b/cpp/INSTALL.SOLARIS @@ -6,24 +6,14 @@ Requirements Operating System ---------------- -Ice is expected to build and run properly on Solaris 8, Solaris 9 -and Solaris 10 on SPARC and x86/x64. However, Ice is officially -supported only on Solaris 10 update 5 or greater for both SPARC and -x86/x64. - -You also need to have /dev/urandom installed. This is installed by -default on Solaris 9 and Solaris 10; on Solaris 8, you need to install -patch 112438-01. - +Ice is supported on: + - Solaris 11 for SPARC. C++ compiler ------------ -Ice is expected to build properly with GCC 3.4 or later. However, only -the following compilers are officially supported: - -- GCC 3.4.3 on x86/x64 -- GCC 4.3.2 on SPARC +Ice is supported with: +- Solaris Studio 12.3 (CC 5.12) Third-party libraries @@ -31,13 +21,11 @@ Third-party libraries Ice has dependencies on a number of third-party libraries: -- Berkeley DB 4.8.30 -- expat 1.95.7 or 2.0.0 -- OpenSSL 0.9.7 or later (OpenSSL 0.9.8 or later recommended) -- bzip2 1.0.x +- Berkeley DB 5.1.25 (from pkg.oracle.com) +- expat 2.0.1 (from pkg.oracle.com) +- OpenSSL 1.0.0 (from pkg.oracle.com) +- bzip2 1.0.6 (from pkg.oracle.com) - mcpp 2.7.2 (with patches) -- libiconv 1.13.1 (x86/x64 only) -- QT 4.5.3 (optional) We recommend downloading the Ice third-party source archive from @@ -55,17 +43,12 @@ expat http://expat.sourceforge.net OpenSSL http://www.openssl.org bzip2 http://sources.redhat.com/bzip2 mcpp http://mcpp.sourceforge.net -libiconv http://www.gnu.org/software/libiconv -QT http://qt.nokia.com - -GNU Make 3.80 +GNU Make 3.81 ------------- -GNU Make 3.80 is required to build Ice on Solaris. GNU make is -distributed on the "Solaris 10 OS Companion Software DVD": - -http://www.sun.com/software/solaris/freeware/ +GNU Make 3.81 is required to build Ice on Solaris. It can be installed +using pkg.oracle.com (package name: gnu-make). ====================================================================== @@ -97,9 +80,7 @@ $ gmake This will build the Ice core libraries, services, tests and examples. -Python is required to run the test suite: - - http://www.python.org/download +Python is required to run the test suite. After a successful build, you can run the test suite: diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 67335ca86f6..3b3af0e18fa 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -320,6 +320,7 @@ ifeq ($(MinGW), yes) endif EVERYTHING = all depend clean install +EVERYTHING_EXCEPT_ALL = depend clean install .SUFFIXES: .SUFFIXES: .cpp .c .o diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index ab7fcfd86f9..ba26ecf6e7d 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -13,115 +13,57 @@ # # If CXX is not defined anywhere, the default (from gmake) is g++. -# If you want to build with another compiler, you can edit this line and -# uncomment it, or define CXX=<desired-compiler> in your environment. # -#CXX = CC +CXX = CC # This variable is used to determine the machine type. -# For SUN UltraSPARC machines: sun4u +# For SPARC machines: sun4u and sun4v # For x86/x64 machines: i86pc # -MACHINE_TYPE := $(shell uname -m) +MACHINE_TYPE := $(shell uname -m) ifeq ($(CXX),CC) # - # Sun CC + # Recent version of Sun CC # - - # - # Which version of CC are we using? - # - CCVERSION = $(filter 5.%, $(shell CC -V 2>&1)) - - ifeq ($(CCVERSION),5.9) - ifeq ($(LP64),yes) - CXXARCHFLAGS += -m64 - else - CXXARCHFLAGS += -m32 - endif - else - ifeq ($(MACHINE_TYPE),sun4u) - ifeq ($(LP64),yes) - CXXARCHFLAGS += -xarch=v9 - else - CXXARCHFLAGS += -xarch=v8plus - endif - endif - - ifeq ($(MACHINE_TYPE),i86pc) - ifeq ($(LP64),yes) - CXXARCHFLAGS += -xarch=amd64 - endif - endif - endif - - ifeq ($(CCVERSION),5.3) - FLEX_NOLINE = yes - BISON_NOLINE = yes - TEMPLATE_REPOSITORY = SunWS_cache + + ifeq ($(LP64),yes) + CXXARCHFLAGS += -m64 else - ifeq ($(CCVERSION),5.4) - CXXWARNFLAGS = +w - TEMPLATE_REPOSITORY = SunWS_cache - else - # - # Assumes >= 5.5 - # - # wvarhidenmem,wvarhidemem: various name hiding - # - CXXWARNFLAGS = +w -erroff=wvarhidenmem,wvarhidemem - CXXSCOPEFLAGS = -xldscope=hidden - endif + CXXARCHFLAGS += -m32 endif - + # - # -features=tmplife is needed to destroy temporary objects immediately - # (as specified by ISO C++) instead of at the end of the current block. - # This is very useful to avoid deadlocks when using Freeze Map - # iterators. + # wvarhidenmem,wvarhidemem: various name hiding + # notemsource: Could not find source for <template name> + # + CXXWARNFLAGS = +w -errtags -erroff=wvarhidenmem,wvarhidemem,notemsource + CXXSCOPEFLAGS = -xldscope=hidden - CXXFLAGS = -mt +p -features=tmplife $(CXXSCOPEFLAGS) $(CXXWARNFLAGS) $(CXXARCHFLAGS) + CXXFLAGS = -mt +p $(CXXSCOPEFLAGS) $(CXXWARNFLAGS) $(CXXARCHFLAGS) ifneq ($(GENPIC),no) - CXXFLAGS += -KPIC + CXXFLAGS += -xcode=pic32 endif ifeq ($(OPTIMIZE),yes) - CXXFLAGS += -O -DNDEBUG + CXXFLAGS += -O -DNDEBUG else - CXXFLAGS += -g + CXXFLAGS += -g endif + + mkshlib = $(CXX) -G $(LDFLAGS) -o $(1) -h $(2) $(3) $(4) - # - # C++ run-time libraries, necessary for linking some shared libraries. - # - CXXLIBS = -lCstd -lCrun - - mkshlib = $(CXX) -G $(LDFLAGS) -o $(1) -h $(2) $(3) $(4) - - mklib = $(CXX) -xar -o $(1) $(2) + mklib = $(CXX) -xar -o $(1) $(2) ifneq ($(embedded_runpath_prefix),) - LDPLATFORMFLAGS = -norunpath -R $(runpath_libdir):/usr/sfw/$(libsubdir) -z text $(PLATFORMLIBDIRS) + LDPLATFORMFLAGS = -norunpath -R $(runpath_libdir) -z text $(PLATFORMLIBDIRS) else - LDPLATFORMFLAGS = -norunpath -R /usr/sfw/$(libsubdir) -z text $(PLATFORMLIBDIRS) + LDPLATFORMFLAGS = -norunpath -z text $(PLATFORMLIBDIRS) endif - # - # On SPARC, we also link with <SUNWspro>/lib or lib/v9. - # See http://forum.java.sun.com/thread.jspa?threadID=5279267 - # - ifeq ($(MACHINE_TYPE),sun4u) - CCLIBDIR = $(shell whatdir CC)/../../lib - ifeq ($(LP64),yes) - PLATFORMLIBDIRS := -L$(CCLIBDIR)/v9 - else - PLATFORMLIBDIRS := -L$(CCLIBDIR) - endif - endif endif ifeq ($(CXX),gcc) @@ -169,19 +111,9 @@ BASELIBS = -lIceUtil -lpthread LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS) ifneq ($(QT_HOME),) - QT_FLAGS = -I$(QT_HOME)/include - QT_LIBS = -L$(QT_HOME)/$(libsubdir) -lQtCore -lQtSql + QT_FLAGS = -I$(QT_HOME)/include + QT_LIBS = -L$(QT_HOME)/$(libsubdir) -lQtCore -lQtSql endif ICEUTIL_OS_LIBS = -lpthread -lrt ICE_OS_LIBS = -ldl -lsocket - -ifeq ($(MACHINE_TYPE),sun4u) - lp64suffix = /sparcv9 - lp64binsuffix = /sparcv9 -endif -ifeq ($(MACHINE_TYPE),i86pc) - lp64suffix = /amd64 - lp64binsuffix = /amd64 -endif - diff --git a/cpp/demo/Freeze/Makefile b/cpp/demo/Freeze/Makefile index ac8e604fe0a..112cc74223b 100644 --- a/cpp/demo/Freeze/Makefile +++ b/cpp/demo/Freeze/Makefile @@ -13,7 +13,15 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = casino phonebook bench library backup transform customEvictor -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/demo/Freeze/library/LibraryI.h b/cpp/demo/Freeze/library/LibraryI.h index f5c319c4383..ef4b9a1e0a6 100644 --- a/cpp/demo/Freeze/library/LibraryI.h +++ b/cpp/demo/Freeze/library/LibraryI.h @@ -45,6 +45,10 @@ private: typedef IceUtil::Handle<LibraryI> LibraryIPtr; +#ifdef __SUNPRO_CC +# pragma error_messages(off,hidef) +#endif + class BookI : public Demo::Book, public IceUtil::AbstractMutexI<IceUtil::Mutex> { public: @@ -63,4 +67,8 @@ private: bool _destroyed; }; +#ifdef __SUNPRO_CC +# pragma error_messages(default,hidef) +#endif + #endif diff --git a/cpp/demo/Freeze/library/Scanner.cpp b/cpp/demo/Freeze/library/Scanner.cpp index 1b215e134d4..38012540f72 100644 --- a/cpp/demo/Freeze/library/Scanner.cpp +++ b/cpp/demo/Freeze/library/Scanner.cpp @@ -54,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -544,9 +535,19 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) -#line 549 "lex.yy.c" +#line 550 "lex.yy.c" #define INITIAL 0 @@ -627,12 +628,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -640,7 +636,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -651,7 +647,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -733,10 +729,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 48 "Scanner.l" +#line 58 "Scanner.l" -#line 739 "lex.yy.c" +#line 735 "lex.yy.c" if ( !(yy_init) ) { @@ -821,7 +817,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 50 "Scanner.l" +#line 60 "Scanner.l" { // C++-style comment int c; @@ -834,7 +830,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 60 "Scanner.l" +#line 70 "Scanner.l" { // C-style comment while(true) @@ -862,84 +858,84 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 85 "Scanner.l" +#line 95 "Scanner.l" { return TOK_HELP; } YY_BREAK case 4: YY_RULE_SETUP -#line 89 "Scanner.l" +#line 99 "Scanner.l" { return TOK_EXIT; } YY_BREAK case 5: YY_RULE_SETUP -#line 93 "Scanner.l" +#line 103 "Scanner.l" { return TOK_ADD_BOOK; } YY_BREAK case 6: YY_RULE_SETUP -#line 97 "Scanner.l" +#line 107 "Scanner.l" { return TOK_FIND_ISBN; } YY_BREAK case 7: YY_RULE_SETUP -#line 101 "Scanner.l" +#line 111 "Scanner.l" { return TOK_FIND_AUTHORS; } YY_BREAK case 8: YY_RULE_SETUP -#line 105 "Scanner.l" +#line 115 "Scanner.l" { return TOK_NEXT_FOUND_BOOK; } YY_BREAK case 9: YY_RULE_SETUP -#line 109 "Scanner.l" +#line 119 "Scanner.l" { return TOK_PRINT_CURRENT; } YY_BREAK case 10: YY_RULE_SETUP -#line 113 "Scanner.l" +#line 123 "Scanner.l" { return TOK_RENT_BOOK; } YY_BREAK case 11: YY_RULE_SETUP -#line 117 "Scanner.l" +#line 127 "Scanner.l" { return TOK_RETURN_BOOK; } YY_BREAK case 12: YY_RULE_SETUP -#line 121 "Scanner.l" +#line 131 "Scanner.l" { return TOK_REMOVE_CURRENT; } YY_BREAK case 13: YY_RULE_SETUP -#line 125 "Scanner.l" +#line 135 "Scanner.l" { return TOK_SET_EVICTOR_SIZE; } YY_BREAK case 14: YY_RULE_SETUP -#line 129 "Scanner.l" +#line 139 "Scanner.l" { return TOK_SHUTDOWN; } @@ -947,7 +943,7 @@ YY_RULE_SETUP case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 133 "Scanner.l" +#line 143 "Scanner.l" { size_t len = strlen(yytext); for(size_t i = 0; i < len; ++i) @@ -962,14 +958,14 @@ YY_RULE_SETUP case 16: /* rule 16 can match eol */ YY_RULE_SETUP -#line 144 "Scanner.l" +#line 154 "Scanner.l" { return ';'; } YY_BREAK case 17: YY_RULE_SETUP -#line 148 "Scanner.l" +#line 158 "Scanner.l" { // "..."-type strings string s; @@ -1046,7 +1042,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 222 "Scanner.l" +#line 232 "Scanner.l" { // '...'-type strings string s; @@ -1074,7 +1070,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 247 "Scanner.l" +#line 257 "Scanner.l" { // Simple strings string s; @@ -1101,10 +1097,10 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 271 "Scanner.l" +#line 281 "Scanner.l" ECHO; YY_BREAK -#line 1107 "lex.yy.c" +#line 1103 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1858,8 +1854,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -2098,7 +2094,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 271 "Scanner.l" +#line 281 "Scanner.l" diff --git a/cpp/demo/Freeze/library/Scanner.l b/cpp/demo/Freeze/library/Scanner.l index 8494112f22d..b44fc68d227 100644 --- a/cpp/demo/Freeze/library/Scanner.l +++ b/cpp/demo/Freeze/library/Scanner.l @@ -35,6 +35,16 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) %} diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.h b/cpp/demo/Freeze/phonebook/PhoneBookI.h index ba4ae78244b..bfbba014e27 100644 --- a/cpp/demo/Freeze/phonebook/PhoneBookI.h +++ b/cpp/demo/Freeze/phonebook/PhoneBookI.h @@ -23,6 +23,10 @@ typedef IceUtil::Handle<PhoneBookI> PhoneBookIPtr; class ContactI; typedef IceUtil::Handle<ContactI> ContactIPtr; +#ifdef __SUNPRO_CC +# pragma error_messages(off,hidef) +#endif + class ContactI : public Demo::Contact, public IceUtil::AbstractMutexI<IceUtil::Mutex> { public: @@ -45,6 +49,10 @@ private: const ContactFactoryPtr _factory; }; +#ifdef __SUNPRO_CC +# pragma error_messages(default,hidef) +#endif + class PhoneBookI : public Demo::PhoneBook { public: diff --git a/cpp/demo/Freeze/phonebook/Scanner.cpp b/cpp/demo/Freeze/phonebook/Scanner.cpp index 852d8f9f795..a0f41f1a814 100644 --- a/cpp/demo/Freeze/phonebook/Scanner.cpp +++ b/cpp/demo/Freeze/phonebook/Scanner.cpp @@ -54,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -544,9 +535,19 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) -#line 549 "lex.yy.c" +#line 550 "lex.yy.c" #define INITIAL 0 @@ -627,12 +628,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -640,7 +636,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -651,7 +647,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -733,10 +729,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 48 "Scanner.l" +#line 58 "Scanner.l" -#line 739 "lex.yy.c" +#line 735 "lex.yy.c" if ( !(yy_init) ) { @@ -821,7 +817,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 50 "Scanner.l" +#line 60 "Scanner.l" { // C++-style comment int c; @@ -834,7 +830,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 60 "Scanner.l" +#line 70 "Scanner.l" { // C-style comment while(true) @@ -862,84 +858,84 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 85 "Scanner.l" +#line 95 "Scanner.l" { return TOK_HELP; } YY_BREAK case 4: YY_RULE_SETUP -#line 89 "Scanner.l" +#line 99 "Scanner.l" { return TOK_EXIT; } YY_BREAK case 5: YY_RULE_SETUP -#line 93 "Scanner.l" +#line 103 "Scanner.l" { return TOK_ADD_CONTACTS; } YY_BREAK case 6: YY_RULE_SETUP -#line 97 "Scanner.l" +#line 107 "Scanner.l" { return TOK_FIND_CONTACTS; } YY_BREAK case 7: YY_RULE_SETUP -#line 101 "Scanner.l" +#line 111 "Scanner.l" { return TOK_NEXT_FOUND_CONTACT; } YY_BREAK case 8: YY_RULE_SETUP -#line 105 "Scanner.l" +#line 115 "Scanner.l" { return TOK_PRINT_CURRENT; } YY_BREAK case 9: YY_RULE_SETUP -#line 109 "Scanner.l" +#line 119 "Scanner.l" { return TOK_SET_CURRENT_NAME; } YY_BREAK case 10: YY_RULE_SETUP -#line 113 "Scanner.l" +#line 123 "Scanner.l" { return TOK_SET_CURRENT_ADDRESS; } YY_BREAK case 11: YY_RULE_SETUP -#line 117 "Scanner.l" +#line 127 "Scanner.l" { return TOK_SET_CURRENT_PHONE; } YY_BREAK case 12: YY_RULE_SETUP -#line 121 "Scanner.l" +#line 131 "Scanner.l" { return TOK_REMOVE_CURRENT; } YY_BREAK case 13: YY_RULE_SETUP -#line 125 "Scanner.l" +#line 135 "Scanner.l" { return TOK_SET_EVICTOR_SIZE; } YY_BREAK case 14: YY_RULE_SETUP -#line 129 "Scanner.l" +#line 139 "Scanner.l" { return TOK_SHUTDOWN; } @@ -947,7 +943,7 @@ YY_RULE_SETUP case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 133 "Scanner.l" +#line 143 "Scanner.l" { size_t len = strlen(yytext); for(size_t i = 0; i < len; ++i) @@ -962,14 +958,14 @@ YY_RULE_SETUP case 16: /* rule 16 can match eol */ YY_RULE_SETUP -#line 144 "Scanner.l" +#line 154 "Scanner.l" { return ';'; } YY_BREAK case 17: YY_RULE_SETUP -#line 148 "Scanner.l" +#line 158 "Scanner.l" { // "..."-type strings string s; @@ -1046,7 +1042,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 222 "Scanner.l" +#line 232 "Scanner.l" { // '...'-type strings string s; @@ -1074,7 +1070,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 247 "Scanner.l" +#line 257 "Scanner.l" { // Simple strings string s; @@ -1101,10 +1097,10 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 271 "Scanner.l" +#line 281 "Scanner.l" ECHO; YY_BREAK -#line 1107 "lex.yy.c" +#line 1103 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1858,8 +1854,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -2098,7 +2094,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 271 "Scanner.l" +#line 281 "Scanner.l" diff --git a/cpp/demo/Freeze/phonebook/Scanner.l b/cpp/demo/Freeze/phonebook/Scanner.l index 02b0a4d0e44..734f2a0f374 100644 --- a/cpp/demo/Freeze/phonebook/Scanner.l +++ b/cpp/demo/Freeze/phonebook/Scanner.l @@ -35,6 +35,16 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) %} diff --git a/cpp/demo/Glacier2/Makefile b/cpp/demo/Glacier2/Makefile index e0699c57f5d..a5dccad2835 100644 --- a/cpp/demo/Glacier2/Makefile +++ b/cpp/demo/Glacier2/Makefile @@ -13,7 +13,15 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = callback chat -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/demo/Ice/Makefile b/cpp/demo/Ice/Makefile index ade7befd86b..c0184b07dfe 100644 --- a/cpp/demo/Ice/Makefile +++ b/cpp/demo/Ice/Makefile @@ -29,7 +29,15 @@ SUBDIRS = minimal \ interleaved \ properties -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/demo/IceBox/Makefile b/cpp/demo/IceBox/Makefile index 5832f5f158b..f62a52b3d5b 100644 --- a/cpp/demo/IceBox/Makefile +++ b/cpp/demo/IceBox/Makefile @@ -13,7 +13,15 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = hello -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/demo/IceGrid/Makefile b/cpp/demo/IceGrid/Makefile index 99e364012c7..ef6f45e8c0b 100644 --- a/cpp/demo/IceGrid/Makefile +++ b/cpp/demo/IceGrid/Makefile @@ -18,7 +18,15 @@ SUBDIRS = simple \ icebox \ secure -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/demo/IceStorm/Makefile b/cpp/demo/IceStorm/Makefile index f0a03cdad10..c549f89b711 100644 --- a/cpp/demo/IceStorm/Makefile +++ b/cpp/demo/IceStorm/Makefile @@ -13,7 +13,15 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = clock counter replicated replicated2 -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/demo/IceStorm/counter/CounterObserverI.cpp b/cpp/demo/IceStorm/counter/CounterObserverI.cpp index d2cfaadd0d3..fbb967e1bbd 100644 --- a/cpp/demo/IceStorm/counter/CounterObserverI.cpp +++ b/cpp/demo/IceStorm/counter/CounterObserverI.cpp @@ -22,7 +22,7 @@ CounterObserverI::CounterObserverI(const MTPrinterPtr& printer) : void CounterObserverI::init(int value, const Ice::Current&) { - Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); _value = value; ostringstream ostr; ostr << "init: " << value << endl; @@ -32,7 +32,7 @@ CounterObserverI::init(int value, const Ice::Current&) void CounterObserverI::inc(int value, const Ice::Current&) { - Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); _value += value; ostringstream ostr; ostr << "int: " << value << " total: " << _value << endl; diff --git a/cpp/demo/IceStorm/counter/CounterObserverI.h b/cpp/demo/IceStorm/counter/CounterObserverI.h index ae560222883..c1129bda8cc 100644 --- a/cpp/demo/IceStorm/counter/CounterObserverI.h +++ b/cpp/demo/IceStorm/counter/CounterObserverI.h @@ -32,7 +32,7 @@ private: }; typedef IceUtil::Handle<MTPrinter> MTPrinterPtr; -class CounterObserverI : public Demo::CounterObserver, public IceUtil::Mutex +class CounterObserverI : public Demo::CounterObserver { public: @@ -45,6 +45,7 @@ private: int _value; MTPrinterPtr _printer; + IceUtil::Mutex _mutex; }; #endif diff --git a/cpp/demo/IceUtil/Makefile b/cpp/demo/IceUtil/Makefile index b6fce9fd281..05fd5d14349 100644 --- a/cpp/demo/IceUtil/Makefile +++ b/cpp/demo/IceUtil/Makefile @@ -13,7 +13,15 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = workqueue -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile index 08f69def824..5fdd6ccc7a2 100644 --- a/cpp/demo/Makefile +++ b/cpp/demo/Makefile @@ -20,7 +20,15 @@ SUBDIRS = IceUtil \ IceGrid \ book -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/demo/book/Makefile b/cpp/demo/book/Makefile index 37737aaa8ac..991b639eea1 100644 --- a/cpp/demo/book/Makefile +++ b/cpp/demo/book/Makefile @@ -17,7 +17,15 @@ SUBDIRS = printer \ evictor_filesystem \ map_filesystem -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/demo/book/evictor_filesystem/Scanner.cpp b/cpp/demo/book/evictor_filesystem/Scanner.cpp index bc4b1c7f7a3..9920e412452 100644 --- a/cpp/demo/book/evictor_filesystem/Scanner.cpp +++ b/cpp/demo/book/evictor_filesystem/Scanner.cpp @@ -54,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -532,9 +523,19 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) -#line 537 "lex.yy.c" +#line 538 "lex.yy.c" #define INITIAL 0 @@ -615,12 +616,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -628,7 +624,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -639,7 +635,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -721,10 +717,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 48 "Scanner.l" +#line 58 "Scanner.l" -#line 727 "lex.yy.c" +#line 723 "lex.yy.c" if ( !(yy_init) ) { @@ -809,7 +805,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 50 "Scanner.l" +#line 60 "Scanner.l" { // C++-style comment int c; @@ -822,7 +818,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 60 "Scanner.l" +#line 70 "Scanner.l" { // C-style comment while(true) @@ -850,77 +846,77 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 85 "Scanner.l" +#line 95 "Scanner.l" { return TOK_HELP; } YY_BREAK case 4: YY_RULE_SETUP -#line 89 "Scanner.l" +#line 99 "Scanner.l" { return TOK_EXIT; } YY_BREAK case 5: YY_RULE_SETUP -#line 93 "Scanner.l" +#line 103 "Scanner.l" { return TOK_LIST; } YY_BREAK case 6: YY_RULE_SETUP -#line 97 "Scanner.l" +#line 107 "Scanner.l" { return TOK_LIST_RECURSIVE; } YY_BREAK case 7: YY_RULE_SETUP -#line 101 "Scanner.l" +#line 111 "Scanner.l" { return TOK_CREATE_FILE; } YY_BREAK case 8: YY_RULE_SETUP -#line 105 "Scanner.l" +#line 115 "Scanner.l" { return TOK_CREATE_DIR; } YY_BREAK case 9: YY_RULE_SETUP -#line 109 "Scanner.l" +#line 119 "Scanner.l" { return TOK_PWD; } YY_BREAK case 10: YY_RULE_SETUP -#line 113 "Scanner.l" +#line 123 "Scanner.l" { return TOK_CD; } YY_BREAK case 11: YY_RULE_SETUP -#line 117 "Scanner.l" +#line 127 "Scanner.l" { return TOK_CAT; } YY_BREAK case 12: YY_RULE_SETUP -#line 121 "Scanner.l" +#line 131 "Scanner.l" { return TOK_WRITE; } YY_BREAK case 13: YY_RULE_SETUP -#line 125 "Scanner.l" +#line 135 "Scanner.l" { return TOK_RM; } @@ -928,7 +924,7 @@ YY_RULE_SETUP case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 129 "Scanner.l" +#line 139 "Scanner.l" { size_t len = strlen(yytext); for(size_t i = 0; i < len; ++i) @@ -943,14 +939,14 @@ YY_RULE_SETUP case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 140 "Scanner.l" +#line 150 "Scanner.l" { return ';'; } YY_BREAK case 16: YY_RULE_SETUP -#line 144 "Scanner.l" +#line 154 "Scanner.l" { // "..."-type strings string s; @@ -1027,7 +1023,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 218 "Scanner.l" +#line 228 "Scanner.l" { // '...'-type strings string s; @@ -1055,7 +1051,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 243 "Scanner.l" +#line 253 "Scanner.l" { // Simple strings string s; @@ -1082,10 +1078,10 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 267 "Scanner.l" +#line 277 "Scanner.l" ECHO; YY_BREAK -#line 1088 "lex.yy.c" +#line 1084 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1839,8 +1835,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -2079,7 +2075,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 267 "Scanner.l" +#line 277 "Scanner.l" diff --git a/cpp/demo/book/evictor_filesystem/Scanner.l b/cpp/demo/book/evictor_filesystem/Scanner.l index 611903c29ef..d6e25e49ed6 100644 --- a/cpp/demo/book/evictor_filesystem/Scanner.l +++ b/cpp/demo/book/evictor_filesystem/Scanner.l @@ -35,6 +35,16 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) %} diff --git a/cpp/demo/book/lifecycle/Scanner.cpp b/cpp/demo/book/lifecycle/Scanner.cpp index bc4b1c7f7a3..9920e412452 100644 --- a/cpp/demo/book/lifecycle/Scanner.cpp +++ b/cpp/demo/book/lifecycle/Scanner.cpp @@ -54,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -532,9 +523,19 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) -#line 537 "lex.yy.c" +#line 538 "lex.yy.c" #define INITIAL 0 @@ -615,12 +616,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -628,7 +624,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -639,7 +635,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -721,10 +717,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 48 "Scanner.l" +#line 58 "Scanner.l" -#line 727 "lex.yy.c" +#line 723 "lex.yy.c" if ( !(yy_init) ) { @@ -809,7 +805,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 50 "Scanner.l" +#line 60 "Scanner.l" { // C++-style comment int c; @@ -822,7 +818,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 60 "Scanner.l" +#line 70 "Scanner.l" { // C-style comment while(true) @@ -850,77 +846,77 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 85 "Scanner.l" +#line 95 "Scanner.l" { return TOK_HELP; } YY_BREAK case 4: YY_RULE_SETUP -#line 89 "Scanner.l" +#line 99 "Scanner.l" { return TOK_EXIT; } YY_BREAK case 5: YY_RULE_SETUP -#line 93 "Scanner.l" +#line 103 "Scanner.l" { return TOK_LIST; } YY_BREAK case 6: YY_RULE_SETUP -#line 97 "Scanner.l" +#line 107 "Scanner.l" { return TOK_LIST_RECURSIVE; } YY_BREAK case 7: YY_RULE_SETUP -#line 101 "Scanner.l" +#line 111 "Scanner.l" { return TOK_CREATE_FILE; } YY_BREAK case 8: YY_RULE_SETUP -#line 105 "Scanner.l" +#line 115 "Scanner.l" { return TOK_CREATE_DIR; } YY_BREAK case 9: YY_RULE_SETUP -#line 109 "Scanner.l" +#line 119 "Scanner.l" { return TOK_PWD; } YY_BREAK case 10: YY_RULE_SETUP -#line 113 "Scanner.l" +#line 123 "Scanner.l" { return TOK_CD; } YY_BREAK case 11: YY_RULE_SETUP -#line 117 "Scanner.l" +#line 127 "Scanner.l" { return TOK_CAT; } YY_BREAK case 12: YY_RULE_SETUP -#line 121 "Scanner.l" +#line 131 "Scanner.l" { return TOK_WRITE; } YY_BREAK case 13: YY_RULE_SETUP -#line 125 "Scanner.l" +#line 135 "Scanner.l" { return TOK_RM; } @@ -928,7 +924,7 @@ YY_RULE_SETUP case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 129 "Scanner.l" +#line 139 "Scanner.l" { size_t len = strlen(yytext); for(size_t i = 0; i < len; ++i) @@ -943,14 +939,14 @@ YY_RULE_SETUP case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 140 "Scanner.l" +#line 150 "Scanner.l" { return ';'; } YY_BREAK case 16: YY_RULE_SETUP -#line 144 "Scanner.l" +#line 154 "Scanner.l" { // "..."-type strings string s; @@ -1027,7 +1023,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 218 "Scanner.l" +#line 228 "Scanner.l" { // '...'-type strings string s; @@ -1055,7 +1051,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 243 "Scanner.l" +#line 253 "Scanner.l" { // Simple strings string s; @@ -1082,10 +1078,10 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 267 "Scanner.l" +#line 277 "Scanner.l" ECHO; YY_BREAK -#line 1088 "lex.yy.c" +#line 1084 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1839,8 +1835,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -2079,7 +2075,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 267 "Scanner.l" +#line 277 "Scanner.l" diff --git a/cpp/demo/book/lifecycle/Scanner.l b/cpp/demo/book/lifecycle/Scanner.l index 611903c29ef..d6e25e49ed6 100644 --- a/cpp/demo/book/lifecycle/Scanner.l +++ b/cpp/demo/book/lifecycle/Scanner.l @@ -35,6 +35,16 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) %} diff --git a/cpp/demo/book/map_filesystem/FilesystemI.cpp b/cpp/demo/book/map_filesystem/FilesystemI.cpp index e7793be6ef8..aa582643a04 100644 --- a/cpp/demo/book/map_filesystem/FilesystemI.cpp +++ b/cpp/demo/book/map_filesystem/FilesystemI.cpp @@ -193,7 +193,11 @@ DirectoryI::DirectoryI(const Ice::CommunicatorPtr& communicator, const string& e { DirectoryEntry d; d.name = "/"; +#ifdef __SUNPRO_CC + dirDB.put(IdentityDirectoryEntryMap::value_type(rootId, d)); +#else dirDB.put(make_pair(rootId, d)); +#endif } break; } @@ -345,7 +349,11 @@ DirectoryI::createDirectory(const string& name, const Ice::Current& c) entry.nodes.insert(make_pair(name, nd)); p.set(entry); +#ifdef __SUNPRO_CC + directoryDB.put(IdentityDirectoryEntryMap::value_type(id, d)); +#else directoryDB.put(make_pair(id, d)); +#endif txn.commit(); @@ -407,7 +415,12 @@ DirectoryI::createFile(const string& name, const Ice::Current& c) entry.nodes.insert(make_pair(name, nd)); p.set(entry); + +#ifdef __SUNPRO_CC + fileDB.put(IdentityFileEntryMap::value_type(id, d)); +#else fileDB.put(make_pair(id, d)); +#endif txn.commit(); diff --git a/cpp/demo/book/map_filesystem/Scanner.cpp b/cpp/demo/book/map_filesystem/Scanner.cpp index bc4b1c7f7a3..9920e412452 100644 --- a/cpp/demo/book/map_filesystem/Scanner.cpp +++ b/cpp/demo/book/map_filesystem/Scanner.cpp @@ -54,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -532,9 +523,19 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) -#line 537 "lex.yy.c" +#line 538 "lex.yy.c" #define INITIAL 0 @@ -615,12 +616,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -628,7 +624,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -639,7 +635,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -721,10 +717,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 48 "Scanner.l" +#line 58 "Scanner.l" -#line 727 "lex.yy.c" +#line 723 "lex.yy.c" if ( !(yy_init) ) { @@ -809,7 +805,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 50 "Scanner.l" +#line 60 "Scanner.l" { // C++-style comment int c; @@ -822,7 +818,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 60 "Scanner.l" +#line 70 "Scanner.l" { // C-style comment while(true) @@ -850,77 +846,77 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 85 "Scanner.l" +#line 95 "Scanner.l" { return TOK_HELP; } YY_BREAK case 4: YY_RULE_SETUP -#line 89 "Scanner.l" +#line 99 "Scanner.l" { return TOK_EXIT; } YY_BREAK case 5: YY_RULE_SETUP -#line 93 "Scanner.l" +#line 103 "Scanner.l" { return TOK_LIST; } YY_BREAK case 6: YY_RULE_SETUP -#line 97 "Scanner.l" +#line 107 "Scanner.l" { return TOK_LIST_RECURSIVE; } YY_BREAK case 7: YY_RULE_SETUP -#line 101 "Scanner.l" +#line 111 "Scanner.l" { return TOK_CREATE_FILE; } YY_BREAK case 8: YY_RULE_SETUP -#line 105 "Scanner.l" +#line 115 "Scanner.l" { return TOK_CREATE_DIR; } YY_BREAK case 9: YY_RULE_SETUP -#line 109 "Scanner.l" +#line 119 "Scanner.l" { return TOK_PWD; } YY_BREAK case 10: YY_RULE_SETUP -#line 113 "Scanner.l" +#line 123 "Scanner.l" { return TOK_CD; } YY_BREAK case 11: YY_RULE_SETUP -#line 117 "Scanner.l" +#line 127 "Scanner.l" { return TOK_CAT; } YY_BREAK case 12: YY_RULE_SETUP -#line 121 "Scanner.l" +#line 131 "Scanner.l" { return TOK_WRITE; } YY_BREAK case 13: YY_RULE_SETUP -#line 125 "Scanner.l" +#line 135 "Scanner.l" { return TOK_RM; } @@ -928,7 +924,7 @@ YY_RULE_SETUP case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 129 "Scanner.l" +#line 139 "Scanner.l" { size_t len = strlen(yytext); for(size_t i = 0; i < len; ++i) @@ -943,14 +939,14 @@ YY_RULE_SETUP case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 140 "Scanner.l" +#line 150 "Scanner.l" { return ';'; } YY_BREAK case 16: YY_RULE_SETUP -#line 144 "Scanner.l" +#line 154 "Scanner.l" { // "..."-type strings string s; @@ -1027,7 +1023,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 218 "Scanner.l" +#line 228 "Scanner.l" { // '...'-type strings string s; @@ -1055,7 +1051,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 243 "Scanner.l" +#line 253 "Scanner.l" { // Simple strings string s; @@ -1082,10 +1078,10 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 267 "Scanner.l" +#line 277 "Scanner.l" ECHO; YY_BREAK -#line 1088 "lex.yy.c" +#line 1084 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1839,8 +1835,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -2079,7 +2075,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 267 "Scanner.l" +#line 277 "Scanner.l" diff --git a/cpp/demo/book/map_filesystem/Scanner.l b/cpp/demo/book/map_filesystem/Scanner.l index 611903c29ef..d6e25e49ed6 100644 --- a/cpp/demo/book/map_filesystem/Scanner.l +++ b/cpp/demo/book/map_filesystem/Scanner.l @@ -35,6 +35,16 @@ using namespace std; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) %} diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h index 9165f30d948..1e1c6df5f32 100644 --- a/cpp/include/Freeze/Freeze.h +++ b/cpp/include/Freeze/Freeze.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_FREEZE_H +#define FREEZE_FREEZE_H #include <Freeze/Initialize.h> #include <Freeze/BackgroundSaveEvictor.h> @@ -16,3 +17,4 @@ #include <Freeze/TransactionHolder.h> #include <Freeze/Catalog.h> +#endif diff --git a/cpp/include/Freeze/Index.h b/cpp/include/Freeze/Index.h index cb05a198ec0..7c15bcad8c6 100644 --- a/cpp/include/Freeze/Index.h +++ b/cpp/include/Freeze/Index.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_INDEX_H +#define FREEZE_INDEX_H #include <Ice/Ice.h> #include <Freeze/DB.h> @@ -55,3 +56,6 @@ private: typedef IceUtil::Handle<Index> IndexPtr; } + +#endif + diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h index a81407e23a2..6ea3278112f 100644 --- a/cpp/include/Freeze/Initialize.h +++ b/cpp/include/Freeze/Initialize.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_INITIALIZE_H +#define FREEZE_INITIALIZE_H #include <Ice/Ice.h> #include <Freeze/EvictorF.h> @@ -99,3 +100,5 @@ typedef void (*FatalErrorCallback)(const BackgroundSaveEvictorPtr&, const Ice::C FREEZE_API FatalErrorCallback registerFatalErrorCallback(FatalErrorCallback); } + +#endif diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h index bed7f7efad4..abd6912306f 100644 --- a/cpp/include/Freeze/Map.h +++ b/cpp/include/Freeze/Map.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_MAP_H +#define FREEZE_MAP_H #include <Ice/Ice.h> #include <iterator> @@ -1160,5 +1161,7 @@ protected: Ice::EncodingVersion _encoding; }; - } + +#endif + diff --git a/cpp/include/Freeze/TransactionHolder.h b/cpp/include/Freeze/TransactionHolder.h index d3fec8c675c..84e973150a2 100644 --- a/cpp/include/Freeze/TransactionHolder.h +++ b/cpp/include/Freeze/TransactionHolder.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_TRANSACTION_HOLDER_H +#define FREEZE_TRANSACTION_HOLDER_H #include <Freeze/Connection.h> #include <Freeze/Transaction.h> @@ -43,3 +44,5 @@ private: }; } + +#endif diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h index edbe14f31c6..6d2846e4443 100644 --- a/cpp/include/Glacier2/Application.h +++ b/cpp/include/Glacier2/Application.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_APPLICATION_H +#define GLACIER2_APPLICATION_H #include <Ice/Application.h> @@ -216,3 +217,5 @@ private: }; } + +#endif diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h index f0490cdad44..a970ac4d11a 100644 --- a/cpp/include/Glacier2/Glacier2.h +++ b/cpp/include/Glacier2/Glacier2.h @@ -7,8 +7,8 @@ // // ********************************************************************** -#pragma once - +#ifndef GLACIER2_H +#define GLACIER2_H #include <IceUtil/Config.h> #include <Glacier2/Router.h> #include <Glacier2/Session.h> @@ -17,3 +17,5 @@ # include <Glacier2/Application.h> #endif #include <Glacier2/SessionHelper.h> + +#endif diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h index 41dac3a908e..687c680ce04 100644 --- a/cpp/include/Glacier2/SessionHelper.h +++ b/cpp/include/Glacier2/SessionHelper.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_SESSION_HELPER_H +#define GLACIER2_SESSION_HELPER_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -111,3 +112,5 @@ private: typedef IceUtil::Handle<SessionFactoryHelper> SessionFactoryHelperPtr; } + +#endif diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h index d5d41de58e9..448c88eb97d 100644 --- a/cpp/include/Ice/Application.h +++ b/cpp/include/Ice/Application.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_APPLICATION_H +#define ICE_APPLICATION_H #include <Ice/Ice.h> @@ -151,3 +152,5 @@ protected: }; } + +#endif diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h index e1fba32b665..69bfc1a2e53 100644 --- a/cpp/include/Ice/BasicStream.h +++ b/cpp/include/Ice/BasicStream.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_BASIC_STREAM_H +#define ICE_BASIC_STREAM_H #include <Ice/InstanceF.h> #include <Ice/ObjectF.h> @@ -890,7 +891,7 @@ private: class WriteEncaps; enum SliceType { NoSlice, ObjectSlice, ExceptionSlice }; - class EncapsDecoder : private ::IceUtil::noncopyable + class ICE_API EncapsDecoder : private ::IceUtil::noncopyable { public: EncapsDecoder(BasicStream* stream, ReadEncaps* encaps, bool sliceObjects) : @@ -961,7 +962,7 @@ private: Ice::Int _typeIdIndex; }; - class EncapsEncoder : private ::IceUtil::noncopyable + class ICE_API EncapsEncoder : private ::IceUtil::noncopyable { public: EncapsEncoder(BasicStream* stream, WriteEncaps* encaps) : @@ -1134,3 +1135,5 @@ private: }; } // End namespace IceInternal + +#endif diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h index 8c1c4339023..37f69eb3725 100644 --- a/cpp/include/Ice/Buffer.h +++ b/cpp/include/Ice/Buffer.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEE_BUFFER_H +#define ICEE_BUFFER_H #include <Ice/Config.h> @@ -149,3 +150,5 @@ public: }; } + +#endif diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h index cb7dfeb288c..9f0381a2b43 100644 --- a/cpp/include/Ice/CommunicatorAsync.h +++ b/cpp/include/Ice/CommunicatorAsync.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_COMMUNICATOR_ASYNC_H +#define ICE_COMMUNICATOR_ASYNC_H #include <Ice/Communicator.h> @@ -140,3 +141,5 @@ newCallback_Communicator_flushBatchRequests(T* instance, void (T::*excb)(const : } } + +#endif diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index bb3231c3a76..5322bb31717 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONFIG_H +#define ICE_CONFIG_H #include <IceUtil/Config.h> @@ -77,3 +78,5 @@ inline int getSystemErrno() { return errno; } #endif } + +#endif diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h index 4a27138aa53..e374d859306 100644 --- a/cpp/include/Ice/ConnectionAsync.h +++ b/cpp/include/Ice/ConnectionAsync.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_ASYNC_H +#define ICE_CONNECTION_ASYNC_H #include <Ice/Connection.h> @@ -139,3 +140,5 @@ newCallback_Connection_flushBatchRequests(T* instance, void (T::*excb)(const ::I } } + +#endif diff --git a/cpp/include/Ice/ConnectionFactoryF.h b/cpp/include/Ice/ConnectionFactoryF.h index 8e2d62712c3..5a5b3c123a1 100644 --- a/cpp/include/Ice/ConnectionFactoryF.h +++ b/cpp/include/Ice/ConnectionFactoryF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_FACTORY_F_H +#define ICE_CONNECTION_FACTORY_F_H #include <IceUtil/Shared.h> @@ -25,3 +26,5 @@ ICE_API IceUtil::Shared* upCast(IncomingConnectionFactory*); typedef IceInternal::Handle<IncomingConnectionFactory> IncomingConnectionFactoryPtr; } + +#endif diff --git a/cpp/include/Ice/ConnectionIF.h b/cpp/include/Ice/ConnectionIF.h index 114bc0f8a5f..2c3b922edaa 100644 --- a/cpp/include/Ice/ConnectionIF.h +++ b/cpp/include/Ice/ConnectionIF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTIONI_F_H +#define ICE_CONNECTIONI_F_H #include <Ice/Handle.h> #include <Ice/LocalObject.h> @@ -32,3 +33,5 @@ enum AsyncStatus }; } + +#endif diff --git a/cpp/include/Ice/ConnectionMonitorF.h b/cpp/include/Ice/ConnectionMonitorF.h index 5c61810e5a5..ebf80a9f02c 100644 --- a/cpp/include/Ice/ConnectionMonitorF.h +++ b/cpp/include/Ice/ConnectionMonitorF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_MONITOR_F_H +#define ICE_CONNECTION_MONITOR_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(ConnectionMonitor*); typedef IceInternal::Handle<ConnectionMonitor> ConnectionMonitorPtr; } + +#endif diff --git a/cpp/include/Ice/Direct.h b/cpp/include/Ice/Direct.h index fde47a9e6cc..90a8944689f 100644 --- a/cpp/include/Ice/Direct.h +++ b/cpp/include/Ice/Direct.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DIRECT_H +#define ICE_DIRECT_H #include <Ice/ServantLocatorF.h> #include <Ice/ReferenceF.h> @@ -54,3 +55,5 @@ private: }; } + +#endif diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h index 0515161c9c5..1949e810983 100644 --- a/cpp/include/Ice/DispatchInterceptor.h +++ b/cpp/include/Ice/DispatchInterceptor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DISPATCH_INTERCEPTOR_H +#define ICE_DISPATCH_INTERCEPTOR_H #include <Ice/Object.h> @@ -31,3 +32,5 @@ public: typedef IceInternal::Handle<DispatchInterceptor> DispatchInterceptorPtr; } + +#endif diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h index 5ad42625215..70a6436a72e 100644 --- a/cpp/include/Ice/Dispatcher.h +++ b/cpp/include/Ice/Dispatcher.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DISPATCHER_H +#define ICE_DISPATCHER_H #include <IceUtil/Config.h> #include <IceUtil/Shared.h> @@ -73,4 +74,6 @@ newDispatcher(const ::std::function<void (const ::Ice::DispatcherCallPtr&, const } } + +#endif #endif diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h index dd1aa9f9526..d499b4f7cdb 100644 --- a/cpp/include/Ice/DynamicLibrary.h +++ b/cpp/include/Ice/DynamicLibrary.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DYNAMIC_LIBRARY_H +#define ICE_DYNAMIC_LIBRARY_H #include <Ice/DynamicLibraryF.h> #include <Ice/StringConverter.h> @@ -103,3 +104,4 @@ private: } +#endif diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h index 184b15a8e57..32b9a01f8d1 100644 --- a/cpp/include/Ice/DynamicLibraryF.h +++ b/cpp/include/Ice/DynamicLibraryF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DYNAMIC_LIBRARY_F_H +#define ICE_DYNAMIC_LIBRARY_F_H #include <IceUtil/Shared.h> @@ -25,4 +26,4 @@ ICE_API IceUtil::Shared* upCast(DynamicLibraryList*); typedef Handle<DynamicLibraryList> DynamicLibraryListPtr; } - +#endif diff --git a/cpp/include/Ice/EndpointFactory.h b/cpp/include/Ice/EndpointFactory.h index 6f344587828..61734728d8c 100644 --- a/cpp/include/Ice/EndpointFactory.h +++ b/cpp/include/Ice/EndpointFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ENDPOINT_FACTORY_H +#define ICE_ENDPOINT_FACTORY_H #include <IceUtil/Shared.h> #include <Ice/EndpointIF.h> @@ -37,3 +38,5 @@ protected: }; } + +#endif diff --git a/cpp/include/Ice/EndpointFactoryF.h b/cpp/include/Ice/EndpointFactoryF.h index dc8bbfdb72f..b5a03c4c35a 100644 --- a/cpp/include/Ice/EndpointFactoryF.h +++ b/cpp/include/Ice/EndpointFactoryF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ENDPOINT_FACTORY_F_H +#define ICE_ENDPOINT_FACTORY_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(EndpointFactory*); typedef Handle<EndpointFactory> EndpointFactoryPtr; } + +#endif diff --git a/cpp/include/Ice/EndpointIF.h b/cpp/include/Ice/EndpointIF.h index d1da6324f2a..4e9c69d1b8b 100644 --- a/cpp/include/Ice/EndpointIF.h +++ b/cpp/include/Ice/EndpointIF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ENDPOINT_I_F_H +#define ICE_ENDPOINT_I_F_H #include <Ice/Handle.h> #include <Ice/LocalObject.h> @@ -24,3 +25,5 @@ ICE_API IceUtil::Shared* upCast(EndpointHostResolver*); typedef Handle<EndpointHostResolver> EndpointHostResolverPtr; } + +#endif diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index 9ed187dae90..7d0d85656ea 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_EXCEPTION_H +#define ICE_EXCEPTION_H #include <IceUtil/Exception.h> #include <Ice/Config.h> @@ -98,3 +99,5 @@ ICE_API std::ostream& operator<<(std::ostream&, const SystemException&); #endif } + +#endif diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h index fe71694cfb2..1350c39db14 100644 --- a/cpp/include/Ice/FactoryTable.h +++ b/cpp/include/Ice/FactoryTable.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_FACTORYTABLE_H +#define ICE_FACTORYTABLE_H #include <IceUtil/Mutex.h> #include <Ice/UserExceptionFactory.h> @@ -44,3 +45,5 @@ private: }; } + +#endif diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h index 09a18ee8429..2e793e0c980 100644 --- a/cpp/include/Ice/FactoryTableInit.h +++ b/cpp/include/Ice/FactoryTableInit.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_FACTORYTABLEINIT_H +#define ICE_FACTORYTABLEINIT_H #include <Ice/FactoryTable.h> @@ -27,3 +28,5 @@ static FactoryTableInit factoryTableInitializer; // Dummy variable to force i extern ICE_API FactoryTable* factoryTable; } + +#endif diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h index 28926302e9b..6349a1d371a 100644 --- a/cpp/include/Ice/Functional.h +++ b/cpp/include/Ice/Functional.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_FUNCTIONAL_H +#define ICE_FUNCTIONAL_H #include <IceUtil/Functional.h> #include <Ice/Handle.h> @@ -133,3 +134,5 @@ secondConstVoidMemFun1(void (T::*p)(A) const) } } + +#endif diff --git a/cpp/include/Ice/GCCountMap.h b/cpp/include/Ice/GCCountMap.h index a27f9465c1a..fded894b317 100644 --- a/cpp/include/Ice/GCCountMap.h +++ b/cpp/include/Ice/GCCountMap.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GCCOUNTMAP_H +#define ICE_GCCOUNTMAP_H #include <map> @@ -19,3 +20,5 @@ class GCShared; typedef ::std::map<GCShared*, int> GCCountMap; } + +#endif diff --git a/cpp/include/Ice/GCShared.h b/cpp/include/Ice/GCShared.h index 3edcf98ee33..e83332c1649 100644 --- a/cpp/include/Ice/GCShared.h +++ b/cpp/include/Ice/GCShared.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GC_SHARED_H +#define ICE_GC_SHARED_H #include <IceUtil/Shared.h> #include <Ice/Config.h> @@ -48,3 +49,5 @@ protected: }; } + +#endif diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h index 1d1703d36c7..57239b36ba8 100644 --- a/cpp/include/Ice/Handle.h +++ b/cpp/include/Ice/Handle.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_HANDLE_H +#define ICE_HANDLE_H #include <IceUtil/Handle.h> #include <Ice/Config.h> @@ -187,3 +188,5 @@ public: }; } + +#endif diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index b69fbafb19e..cb658909ed2 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ICE_H +#define ICE_ICE_H #include <IceUtil/Config.h> #include <Ice/Initialize.h> @@ -46,3 +47,5 @@ #ifndef _WIN32 # include <Ice/IconvStringConverter.h> #endif + +#endif diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h index 5df0dacf802..ed197218699 100644 --- a/cpp/include/Ice/IconvStringConverter.h +++ b/cpp/include/Ice/IconvStringConverter.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ICONV_STRING_CONVERTER +#define ICE_ICONV_STRING_CONVERTER #include <Ice/StringConverter.h> #include <Ice/UndefSysMacros.h> @@ -19,7 +20,7 @@ #include <langinfo.h> #endif -#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || (defined(__sun) && !defined(_XPG6)) || defined(__FreeBSD__) +#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__) // // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962 // @@ -242,7 +243,7 @@ IconvStringConverter<charT>::toUTF8(const charT* sourceStart, const charT* sourc #ifdef NDEBUG iconv(cd, 0, 0, 0, 0); #else - int rs = iconv(cd, 0, 0, 0, 0); + size_t rs = iconv(cd, 0, 0, 0, 0); assert(rs == 0); #endif @@ -295,7 +296,7 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B #ifdef NDEBUG iconv(cd, 0, 0, 0, 0); #else - int rs = iconv(cd, 0, 0, 0, 0); + size_t rs = iconv(cd, 0, 0, 0, 0); assert(rs == 0); #endif @@ -367,3 +368,5 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B } } + +#endif diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h index bca310ef62e..207f381e7b6 100644 --- a/cpp/include/Ice/Incoming.h +++ b/cpp/include/Ice/Incoming.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_INCOMING_H +#define ICE_INCOMING_H #include <Ice/InstanceF.h> #include <Ice/ConnectionIF.h> @@ -125,3 +126,5 @@ private: }; } + +#endif diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h index bbb94ac183f..9f9480bfdec 100644 --- a/cpp/include/Ice/IncomingAsync.h +++ b/cpp/include/Ice/IncomingAsync.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_INCOMING_ASYNC_H +#define ICE_INCOMING_ASYNC_H #include <Ice/IncomingAsyncF.h> #include <Ice/Incoming.h> @@ -103,3 +104,5 @@ public: } } + +#endif diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h index 7e7087f1dc3..5b0d0790745 100644 --- a/cpp/include/Ice/IncomingAsyncF.h +++ b/cpp/include/Ice/IncomingAsyncF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_INCOMING_ASYNC_F_H +#define ICE_INCOMING_ASYNC_F_H #include <IceUtil/Shared.h> @@ -30,3 +31,5 @@ ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*); typedef IceInternal::Handle<AMD_Object_ice_invoke> AMD_Object_ice_invokePtr; } + +#endif diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 1ded5860d6e..00504c8b46c 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_INITIALIZE_H +#define ICE_INITIALIZE_H #include <Ice/CommunicatorF.h> #include <Ice/PropertiesF.h> @@ -122,3 +123,5 @@ namespace IceInternal ICE_API InstancePtr getInstance(const ::Ice::CommunicatorPtr&); } + +#endif diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h index 2e1dd7dedc1..9ce92354595 100644 --- a/cpp/include/Ice/InstanceF.h +++ b/cpp/include/Ice/InstanceF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_INSTANCE_F_H +#define ICE_INSTANCE_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(Instance*); typedef IceInternal::Handle<Instance> InstancePtr; } + +#endif diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h index 39d9cb2aca1..657136182b2 100644 --- a/cpp/include/Ice/LocalObject.h +++ b/cpp/include/Ice/LocalObject.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_LOCAL_OBJECT_H +#define ICE_LOCAL_OBJECT_H #include <IceUtil/Shared.h> #include <Ice/LocalObjectF.h> @@ -37,3 +38,5 @@ public: }; } + +#endif diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h index 4c87038d5a6..c8591c24352 100644 --- a/cpp/include/Ice/LocalObjectF.h +++ b/cpp/include/Ice/LocalObjectF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_LOCAL_OBJECT_F_H +#define ICE_LOCAL_OBJECT_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(::Ice::LocalObject*); typedef IceInternal::Handle< LocalObject > LocalObjectPtr; } + +#endif diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h index ab056984b9b..fec7e79f75b 100644 --- a/cpp/include/Ice/LoggerUtil.h +++ b/cpp/include/Ice/LoggerUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_LOGGER_UTIL_H +#define ICE_LOGGER_UTIL_H #include <Ice/LoggerF.h> #include <Ice/CommunicatorF.h> @@ -118,3 +119,5 @@ public: }; } + +#endif diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index d91d1acc5bb..831842c6ad8 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OBJECT_H +#define ICE_OBJECT_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -172,3 +173,5 @@ ICE_API void ice_writeObject(const OutputStreamPtr&, const ObjectPtr&); ICE_API void ice_readObject(const InputStreamPtr&, ObjectPtr&); } + +#endif diff --git a/cpp/include/Ice/ObjectAdapterFactoryF.h b/cpp/include/Ice/ObjectAdapterFactoryF.h index 145ec884c15..7e2a937cadd 100644 --- a/cpp/include/Ice/ObjectAdapterFactoryF.h +++ b/cpp/include/Ice/ObjectAdapterFactoryF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H +#define ICE_OBJECT_ADAPTER_FACTORY_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(ObjectAdapterFactory*); typedef IceInternal::Handle<ObjectAdapterFactory> ObjectAdapterFactoryPtr; } + +#endif diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h index 285c3856234..803d8105333 100644 --- a/cpp/include/Ice/ObjectF.h +++ b/cpp/include/Ice/ObjectF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OBJECT_F_H +#define ICE_OBJECT_F_H #include <IceUtil/Shared.h> #include <Ice/Handle.h> @@ -21,3 +22,5 @@ typedef IceInternal::Handle< Object > ObjectPtr; ICE_API void __patch(ObjectPtr&, ObjectPtr&); } + +#endif diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h index a839d9a3244..2e0f9f63ca3 100644 --- a/cpp/include/Ice/Outgoing.h +++ b/cpp/include/Ice/Outgoing.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OUTGOING_H +#define ICE_OUTGOING_H #include <IceUtil/Mutex.h> #include <IceUtil/Monitor.h> @@ -214,3 +215,5 @@ private: }; } + +#endif diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h index b12dfd6808d..c8d93290203 100644 --- a/cpp/include/Ice/OutgoingAsync.h +++ b/cpp/include/Ice/OutgoingAsync.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OUTGOING_ASYNC_H +#define ICE_OUTGOING_ASYNC_H #include <IceUtil/Monitor.h> #include <IceUtil/Mutex.h> @@ -600,3 +601,5 @@ public: }; } + +#endif diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h index 1feb42cead2..5b6f4daa1e4 100644 --- a/cpp/include/Ice/OutgoingAsyncF.h +++ b/cpp/include/Ice/OutgoingAsyncF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OUTGOING_ASYNC_F_H +#define ICE_OUTGOING_ASYNC_F_H #include <IceUtil/Shared.h> @@ -50,3 +51,5 @@ ICE_API IceUtil::Shared* upCast(CommunicatorBatchOutgoingAsync*); typedef IceInternal::Handle<CommunicatorBatchOutgoingAsync> CommunicatorBatchOutgoingAsyncPtr; } + +#endif diff --git a/cpp/include/Ice/Protocol.h b/cpp/include/Ice/Protocol.h index 0a83c4ddbac..cf14d1b85a8 100644 --- a/cpp/include/Ice/Protocol.h +++ b/cpp/include/Ice/Protocol.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROTOCOL_H +#define ICE_PROTOCOL_H #include <Ice/Config.h> #include <Ice/Version.h> @@ -187,3 +188,5 @@ checkSupportedEncoding(const Ice::EncodingVersion& v) } } + +#endif diff --git a/cpp/include/Ice/ProtocolPluginFacade.h b/cpp/include/Ice/ProtocolPluginFacade.h index c4283e3b03a..7290cfdf115 100644 --- a/cpp/include/Ice/ProtocolPluginFacade.h +++ b/cpp/include/Ice/ProtocolPluginFacade.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROTOCOL_PLUGIN_FACADE_H +#define ICE_PROTOCOL_PLUGIN_FACADE_H #include <IceUtil/Config.h> #include <IceUtil/Shared.h> @@ -88,3 +89,5 @@ private: }; } + +#endif diff --git a/cpp/include/Ice/ProtocolPluginFacadeF.h b/cpp/include/Ice/ProtocolPluginFacadeF.h index 02e2e8ea999..9e8f0d1c7c1 100644 --- a/cpp/include/Ice/ProtocolPluginFacadeF.h +++ b/cpp/include/Ice/ProtocolPluginFacadeF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H +#define ICE_PROTOCOL_PLUGIN_FACADE_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(ProtocolPluginFacade*); typedef Handle<ProtocolPluginFacade> ProtocolPluginFacadePtr; } + +#endif diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index 12ac7496667..b11df34e71d 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROXY_H +#define ICE_PROXY_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -224,7 +225,7 @@ private: namespace IceProxy { namespace Ice { -class ICE_API Object : public ::IceUtil::Shared, private ::IceUtil::Mutex +class ICE_API Object : public ::IceUtil::Shared { public: @@ -1223,6 +1224,7 @@ private: ::IceInternal::ReferencePtr _reference; ::IceInternal::Handle< ::IceDelegate::Ice::Object> _delegate; + IceUtil::Mutex _mutex; }; } } @@ -2639,3 +2641,5 @@ newCallback_Object_ice_flushBatchRequests(T* instance, } } + +#endif diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h index 108cdee7447..82bf18c497e 100644 --- a/cpp/include/Ice/ProxyF.h +++ b/cpp/include/Ice/ProxyF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROXY_F_H +#define ICE_PROXY_F_H #include <IceUtil/Shared.h> @@ -72,3 +73,6 @@ namespace Ice typedef IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx; } + + +#endif diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h index c915ffaa6ee..a450f9e4c99 100644 --- a/cpp/include/Ice/ProxyFactoryF.h +++ b/cpp/include/Ice/ProxyFactoryF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROXY_FACTORY_F_H +#define ICE_PROXY_FACTORY_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(ProxyFactory*); typedef IceInternal::Handle<ProxyFactory> ProxyFactoryPtr; } + +#endif diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h index b23958d26d5..07d623cb8d9 100644 --- a/cpp/include/Ice/ProxyHandle.h +++ b/cpp/include/Ice/ProxyHandle.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROXY_HANDLE_H +#define ICE_PROXY_HANDLE_H #include <IceUtil/Handle.h> #include <Ice/Config.h> @@ -320,3 +321,5 @@ std::ostream& operator<<(std::ostream& os, ::IceInternal::ProxyHandle<Y> p) { return os << (p ? p->ice_toString() : std::string("")); } + +#endif diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h index 99af2a09af2..80f4d87d08d 100644 --- a/cpp/include/Ice/ReferenceF.h +++ b/cpp/include/Ice/ReferenceF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REFERENCE_F_H +#define ICE_REFERENCE_F_H #include <IceUtil/Shared.h> @@ -29,3 +30,5 @@ ICE_API IceUtil::Shared* upCast(RoutableReference*); typedef IceInternal::Handle<RoutableReference> RoutableReferencePtr; } + +#endif diff --git a/cpp/include/Ice/RequestHandlerF.h b/cpp/include/Ice/RequestHandlerF.h index d637da51f10..cc5df85be4a 100644 --- a/cpp/include/Ice/RequestHandlerF.h +++ b/cpp/include/Ice/RequestHandlerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REQUEST_HANDLER_F_H +#define ICE_REQUEST_HANDLER_F_H #include <IceUtil/Shared.h> #include <Ice/Handle.h> @@ -20,3 +21,5 @@ ICE_API IceUtil::Shared* upCast(RequestHandler*); typedef IceInternal::Handle<RequestHandler> RequestHandlerPtr; } + +#endif diff --git a/cpp/include/Ice/ServantManagerF.h b/cpp/include/Ice/ServantManagerF.h index 395349506bd..4ae03595ad5 100644 --- a/cpp/include/Ice/ServantManagerF.h +++ b/cpp/include/Ice/ServantManagerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVANT_MANAGER_F_H +#define ICE_SERVANT_MANAGER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(ServantManager*); typedef Handle<ServantManager> ServantManagerPtr; } + +#endif diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h index c124d371e1e..a36f8c130df 100644 --- a/cpp/include/Ice/Service.h +++ b/cpp/include/Ice/Service.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVICE_H +#define ICE_SERVICE_H #include <IceUtil/Config.h> #include <Ice/Ice.h> @@ -246,3 +247,5 @@ public: }; } // End of namespace Ice + +#endif diff --git a/cpp/include/Ice/SliceChecksums.h b/cpp/include/Ice/SliceChecksums.h index 8fec4b60c86..cfbdc7c997f 100644 --- a/cpp/include/Ice/SliceChecksums.h +++ b/cpp/include/Ice/SliceChecksums.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SLICE_CHECKSUM_H +#define ICE_SLICE_CHECKSUM_H #include <Ice/SliceChecksumDict.h> @@ -29,3 +30,5 @@ public: }; } + +#endif diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h index b056d9296c0..974cf001472 100644 --- a/cpp/include/Ice/SlicedData.h +++ b/cpp/include/Ice/SlicedData.h @@ -92,6 +92,11 @@ public: virtual void __write(::IceInternal::BasicStream*) const; virtual void __read(::IceInternal::BasicStream*); + +#ifdef __SUNPRO_CC + using Object::__write; + using Object::__read; +#endif private: diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index 7715a496e72..0edf80e97f0 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STREAM_H +#define ICE_STREAM_H #include <Ice/StreamF.h> #include <Ice/CommunicatorF.h> @@ -430,9 +431,15 @@ public: virtual bool __usesClasses() const; +#ifdef __SUNPRO_CC + using UserException::__usesClasses; +#endif + protected: const CommunicatorPtr _communicator; }; } + +#endif diff --git a/cpp/include/Ice/StreamF.h b/cpp/include/Ice/StreamF.h index 92ad61869cf..9fec3ce1d71 100644 --- a/cpp/include/Ice/StreamF.h +++ b/cpp/include/Ice/StreamF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STREAM_F_H +#define ICE_STREAM_F_H #include <IceUtil/Shared.h> @@ -25,3 +26,5 @@ ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*); typedef IceInternal::Handle< OutputStream > OutputStreamPtr; } + +#endif diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h index 7452b90c845..28ee9bb3b9b 100644 --- a/cpp/include/Ice/StringConverter.h +++ b/cpp/include/Ice/StringConverter.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STRING_CONVERTER_H +#define ICE_STRING_CONVERTER_H #include <Ice/Config.h> #include <Ice/CommunicatorF.h> @@ -156,3 +157,5 @@ ICE_API std::string UTF8ToNative(const Ice::CommunicatorPtr&, const std::string&); } + +#endif diff --git a/cpp/include/Ice/UndefSysMacros.h b/cpp/include/Ice/UndefSysMacros.h index 32ccd926258..d412fd1b26d 100644 --- a/cpp/include/Ice/UndefSysMacros.h +++ b/cpp/include/Ice/UndefSysMacros.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UNDEF_SYS_MACROS_H +#define ICE_UNDEF_SYS_MACROS_H // // This header includes macros that can end up being dragged into @@ -37,3 +38,5 @@ #ifdef max #undef max #endif + +#endif diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h index 2fa176d3d68..fd0e97f1cae 100644 --- a/cpp/include/Ice/UserExceptionFactory.h +++ b/cpp/include/Ice/UserExceptionFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_USER_EXCEPTION_FACTORY_H +#define ICE_USER_EXCEPTION_FACTORY_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -27,3 +28,5 @@ public: typedef ::IceUtil::Handle<UserExceptionFactory> UserExceptionFactoryPtr; }; + +#endif diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h index e2f87bf9d43..34e1ed0d854 100644 --- a/cpp/include/IceGrid/IceGrid.h +++ b/cpp/include/IceGrid/IceGrid.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_H +#define ICEGRID_H #include <IceGrid/Admin.h> #include <IceGrid/Descriptor.h> @@ -19,3 +20,5 @@ #include <IceGrid/Registry.h> #include <IceGrid/Session.h> #include <IceGrid/UserAccountMapper.h> + +#endif diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h index 4e110f301d1..917abc28f2e 100644 --- a/cpp/include/IcePatch2/ClientUtil.h +++ b/cpp/include/IcePatch2/ClientUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PATCH2_CLIENT_UTIL_H +#define ICE_PATCH2_CLIENT_UTIL_H #include <Ice/Ice.h> #include <IceUtil/Thread.h> @@ -160,3 +161,5 @@ private: typedef IceUtil::Handle<Patcher> PatcherPtr; } + +#endif diff --git a/cpp/include/IcePatch2/Util.h b/cpp/include/IcePatch2/Util.h index 3813d675bc1..8b92ba88afe 100644 --- a/cpp/include/IcePatch2/Util.h +++ b/cpp/include/IcePatch2/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PATCH2_UTIL_H +#define ICE_PATCH2_UTIL_H #include <Ice/Ice.h> #include <IcePatch2/FileInfo.h> @@ -187,3 +188,5 @@ struct FileTree0 ICE_PATCH2_API void getFileTree0(const FileInfoSeq&, FileTree0&); } + +#endif diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h index 450e3c2b34e..8ffa97c6618 100644 --- a/cpp/include/IceSSL/IceSSL.h +++ b/cpp/include/IceSSL/IceSSL.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_ICE_SSL_H +#define ICE_SSL_ICE_SSL_H #include <IceUtil/Config.h> #ifndef ICE_OS_WINRT @@ -15,3 +16,5 @@ #endif #include <IceSSL/EndpointInfo.h> #include <IceSSL/ConnectionInfo.h> + +#endif diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h index 80772366690..bdc73a7740d 100644 --- a/cpp/include/IceSSL/Plugin.h +++ b/cpp/include/IceSSL/Plugin.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_PLUGIN_H +#define ICE_SSL_PLUGIN_H #include <IceUtil/Time.h> #include <Ice/Plugin.h> @@ -453,3 +454,5 @@ public: typedef IceUtil::Handle<Plugin> PluginPtr; } + +#endif diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h index c0805160a1e..aa637356b39 100644 --- a/cpp/include/IceUtil/AbstractMutex.h +++ b/cpp/include/IceUtil/AbstractMutex.h @@ -7,11 +7,13 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_ABSTRACT_MUTEX_H +#define ICE_UTIL_ABSTRACT_MUTEX_H #include <IceUtil/Config.h> #include <IceUtil/Lock.h> + namespace IceUtil { @@ -111,5 +113,6 @@ public: {} }; - } + +#endif diff --git a/cpp/include/IceUtil/ArgVector.h b/cpp/include/IceUtil/ArgVector.h index 0cf29c4de9e..813f7c873d0 100644 --- a/cpp/include/IceUtil/ArgVector.h +++ b/cpp/include/IceUtil/ArgVector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_ARGVECTOR_H +#define ICE_UTIL_ARGVECTOR_H #include <IceUtil/Config.h> #include <vector> @@ -36,3 +37,5 @@ private: }; } + +#endif diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h index 4c698585072..44899f2c9cf 100644 --- a/cpp/include/IceUtil/Cache.h +++ b/cpp/include/IceUtil/Cache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_CACHE_H +#define ICE_UTIL_CACHE_H #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -357,3 +358,5 @@ Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj) } } + +#endif diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h index bf94fc04d7f..29388ddbeec 100644 --- a/cpp/include/IceUtil/Cond.h +++ b/cpp/include/IceUtil/Cond.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_COND_H +#define ICE_UTIL_COND_H #include <IceUtil/Config.h> #include <IceUtil/Time.h> @@ -318,3 +319,5 @@ Cond::timedWaitImpl(const M& mutex, const Time& timeout) const #endif } // End namespace IceUtil + +#endif diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 06ec81a729f..1ea2dc144ed 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_CONFIG_H +#define ICE_UTIL_CONFIG_H // // Endianness @@ -189,3 +190,4 @@ typedef long long Int64; #define ICE_STRING_VERSION "3.4.2" // "A.B.C", with A=major, B=minor, C=patch #define ICE_INT_VERSION 30402 // AABBCC, with AA=major, BB=minor, CC=patch +#endif diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h index bb6305224ef..ef0d774abd4 100644 --- a/cpp/include/IceUtil/CountDownLatch.h +++ b/cpp/include/IceUtil/CountDownLatch.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_COUNT_DOWN_LATCH_H +#define ICE_UTIL_COUNT_DOWN_LATCH_H #include <IceUtil/Config.h> @@ -45,3 +46,5 @@ private: }; } + +#endif diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h index 24d2012df33..1ae7cc85eb7 100644 --- a/cpp/include/IceUtil/CtrlCHandler.h +++ b/cpp/include/IceUtil/CtrlCHandler.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_CTRL_C_HANDLER_H +#define ICE_UTIL_CTRL_C_HANDLER_H #include <IceUtil/Config.h> #include <IceUtil/Exception.h> @@ -66,3 +67,4 @@ public: } +#endif diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h index 83fd59fdcb0..184961a0ac4 100644 --- a/cpp/include/IceUtil/DisableWarnings.h +++ b/cpp/include/IceUtil/DisableWarnings.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_DISABLEWARNINGS_H +#define ICE_UTIL_DISABLEWARNINGS_H // // This header file disables various annoying compiler warnings that @@ -28,3 +29,5 @@ # pragma warning( 4 : 4355 ) // C4355 'this' : used in base member initializer list # endif #endif + +#endif diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h index fdeb01372e6..ac7c3b3c5f1 100644 --- a/cpp/include/IceUtil/Exception.h +++ b/cpp/include/IceUtil/Exception.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_EXCEPTION_H +#define ICE_UTIL_EXCEPTION_H #include <IceUtil/Config.h> @@ -134,3 +135,5 @@ private: }; } + +#endif diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h index c8973c31884..df091c09cce 100644 --- a/cpp/include/IceUtil/FileUtil.h +++ b/cpp/include/IceUtil/FileUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_FILE_UTIL_H +#define ICE_FILE_UTIL_H #include <IceUtil/Config.h> #include <IceUtil/Shared.h> @@ -120,6 +121,10 @@ public: ifstream(const std::string&, std::ios_base::openmode mode = std::ios_base::in); void open(const std::string&, std::ios_base::openmode mode = std::ios_base::in); +#ifdef __SUNPRO_CC + using std::ifstream::open; +#endif + private: // Hide const char* definitions since they shouldn't be used. @@ -135,6 +140,10 @@ public: ofstream(const std::string&, std::ios_base::openmode mode = std::ios_base::out); void open(const std::string&, std::ios_base::openmode mode = std::ios_base::out); +#ifdef __SUNPRO_CC + using std::ofstream::open; +#endif + private: // Hide const char* definitions since they shouldn't be used. @@ -143,3 +152,4 @@ private: }; } +#endif diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h index 3f57ae4b293..ccc78655940 100644 --- a/cpp/include/IceUtil/Functional.h +++ b/cpp/include/IceUtil/Functional.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_FUNCTIONAL_H +#define ICE_UTIL_FUNCTIONAL_H #include <IceUtil/Handle.h> #include <functional> @@ -383,3 +384,6 @@ secondConstVoidMemFun1(void (T::*p)(A) const) } } + +#endif + diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h index 8e75db3bae4..fe86b9c73ec 100644 --- a/cpp/include/IceUtil/Handle.h +++ b/cpp/include/IceUtil/Handle.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_HANDLE_H +#define ICE_UTIL_HANDLE_H #include <IceUtil/Exception.h> #include <algorithm> @@ -261,3 +262,5 @@ public: }; } + +#endif diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h index 87459b1d6f2..783bcb6f945 100644 --- a/cpp/include/IceUtil/IceUtil.h +++ b/cpp/include/IceUtil/IceUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_ICE_UTIL_H +#define ICE_UTIL_ICE_UTIL_H // // This file must include *all* other headers of IceUtil, except @@ -37,3 +38,5 @@ #include <IceUtil/Timer.h> #include <IceUtil/UUID.h> #include <IceUtil/Unicode.h> + +#endif diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h index 5428b4754d5..4bbe0f08780 100644 --- a/cpp/include/IceUtil/InputUtil.h +++ b/cpp/include/IceUtil/InputUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_INPUT_UTIL_H +#define ICE_UTIL_INPUT_UTIL_H #include <IceUtil/Config.h> #include <string> @@ -42,3 +43,5 @@ ICE_UTIL_API IceUtil::Int64 strToInt64(const char*, char**, int); ICE_UTIL_API bool stringToInt64(const std::string&, IceUtil::Int64&); } + +#endif diff --git a/cpp/include/IceUtil/Iterator.h b/cpp/include/IceUtil/Iterator.h index e64446121b8..c3cc6222a35 100644 --- a/cpp/include/IceUtil/Iterator.h +++ b/cpp/include/IceUtil/Iterator.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_ITERATOR_H +#define ICE_UTIL_ITERATOR_H #include <iterator> @@ -32,3 +33,4 @@ distance(ForwardIterator first, ForwardIterator last) } } +#endif diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h index 573ee546653..cf5ba793e0b 100644 --- a/cpp/include/IceUtil/Lock.h +++ b/cpp/include/IceUtil/Lock.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_LOCK_H +#define ICE_UTIL_LOCK_H #include <IceUtil/Config.h> #include <IceUtil/ThreadException.h> @@ -130,3 +131,5 @@ public: }; } // End namespace IceUtil + +#endif diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h index 2b3404aedf1..48733926cce 100644 --- a/cpp/include/IceUtil/Monitor.h +++ b/cpp/include/IceUtil/Monitor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_MONITOR_H +#define ICE_UTIL_MONITOR_H #include <IceUtil/Config.h> #include <IceUtil/Lock.h> @@ -244,3 +245,5 @@ IceUtil::Monitor<T>::notifyImpl(int nnotify) const } } } + +#endif diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h index 76f2fbdc52f..59b1e42d406 100644 --- a/cpp/include/IceUtil/Mutex.h +++ b/cpp/include/IceUtil/Mutex.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_MUTEX_H +#define ICE_UTIL_MUTEX_H #include <IceUtil/Config.h> #include <IceUtil/Lock.h> @@ -340,3 +341,5 @@ Mutex::willUnlock() const } } // End namespace IceUtil + +#endif diff --git a/cpp/include/IceUtil/MutexProtocol.h b/cpp/include/IceUtil/MutexProtocol.h index 61a956a4b00..a74589f468a 100644 --- a/cpp/include/IceUtil/MutexProtocol.h +++ b/cpp/include/IceUtil/MutexProtocol.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_MUTEX_PROTOCOL_H +#define ICE_UTIL_MUTEX_PROTOCOL_H #include <IceUtil/Config.h> @@ -23,3 +24,5 @@ enum MutexProtocol ICE_UTIL_API MutexProtocol getDefaultMutexProtocol(); } // End namespace IceUtil + +#endif diff --git a/cpp/include/IceUtil/MutexPtrLock.h b/cpp/include/IceUtil/MutexPtrLock.h index c2e4a389c5c..3574a95a442 100644 --- a/cpp/include/IceUtil/MutexPtrLock.h +++ b/cpp/include/IceUtil/MutexPtrLock.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_MUTEX_PTR_LOCK_H +#define ICE_UTIL_MUTEX_PTR_LOCK_H #include <IceUtil/Config.h> #include <IceUtil/ThreadException.h> @@ -78,3 +79,5 @@ private: }; } // End namespace IceUtilInternal + +#endif diff --git a/cpp/include/IceUtil/MutexPtrTryLock.h b/cpp/include/IceUtil/MutexPtrTryLock.h index c4b81d47ce7..7eb64d242c8 100644 --- a/cpp/include/IceUtil/MutexPtrTryLock.h +++ b/cpp/include/IceUtil/MutexPtrTryLock.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_MUTEX_PTR_TRY_LOCK_H +#define ICE_UTIL_MUTEX_PTR_TRY_LOCK_H #include <IceUtil/Config.h> #include <IceUtil/Mutex.h> @@ -77,3 +78,5 @@ private: }; } // End namespace IceUtilInternal + +#endif diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h index 2bc37c5fdff..fb30332a0cb 100644 --- a/cpp/include/IceUtil/Options.h +++ b/cpp/include/IceUtil/Options.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_OPTIONS_H +#define ICE_UTIL_OPTIONS_H #include <IceUtil/Config.h> #include <IceUtil/RecMutex.h> @@ -136,3 +137,5 @@ private: }; } + +#endif diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h index 85954127caf..06bfcca556a 100644 --- a/cpp/include/IceUtil/OutputUtil.h +++ b/cpp/include/IceUtil/OutputUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_OUTPUT_UTIL_H +#define ICE_UTIL_OUTPUT_UTIL_H #include <IceUtil/Config.h> #include <fstream> @@ -357,3 +358,5 @@ operator<<(XMLOutput& o, const EndEscapes&) ICE_UTIL_API XMLOutput& operator<<(XMLOutput&, std::ios_base& (*)(std::ios_base&)); } + +#endif diff --git a/cpp/include/IceUtil/Random.h b/cpp/include/IceUtil/Random.h index 9bdd9caad53..eb9b2ca0051 100644 --- a/cpp/include/IceUtil/Random.h +++ b/cpp/include/IceUtil/Random.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_RANDOM_H +#define ICE_UTIL_RANDOM_H #include <IceUtil/Config.h> #include <IceUtil/Exception.h> @@ -19,3 +20,5 @@ ICE_UTIL_API void generateRandom(char*, int); ICE_UTIL_API unsigned int random(int = 0); } + +#endif diff --git a/cpp/include/IceUtil/ScannerConfig.h b/cpp/include/IceUtil/ScannerConfig.h index dee5caeb80f..3186bee7334 100644 --- a/cpp/include/IceUtil/ScannerConfig.h +++ b/cpp/include/IceUtil/ScannerConfig.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_SCANNER_CONFIG_H +#define ICE_UTIL_SCANNER_CONFIG_H #include <IceUtil/Config.h> // Required by generated Scanners. @@ -22,4 +23,6 @@ // #if defined(_MSC_VER) && (_MSC_VER >= 1600) # include <stdint.h> -#endif
\ No newline at end of file +#endif + +#endif diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h index 15571b22b0e..8e1d0d0ddf0 100644 --- a/cpp/include/IceUtil/ScopedArray.h +++ b/cpp/include/IceUtil/ScopedArray.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_SCOPED_ARRAY_H +#define ICE_UTIL_SCOPED_ARRAY_H #include <IceUtil/Config.h> @@ -85,3 +86,5 @@ private: }; } // End of namespace IceUtil + +#endif diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h index 5de760ed85d..8d843856039 100644 --- a/cpp/include/IceUtil/Shared.h +++ b/cpp/include/IceUtil/Shared.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_SHARED_H +#define ICE_UTIL_SHARED_H #include <IceUtil/Config.h> @@ -143,3 +144,5 @@ protected: }; } + +#endif diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h index 3439d040e36..f2786340b4c 100644 --- a/cpp/include/IceUtil/StringUtil.h +++ b/cpp/include/IceUtil/StringUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STRING_UTIL_H +#define ICE_STRING_UTIL_H #include <IceUtil/Config.h> #include <vector> @@ -86,3 +87,5 @@ ICE_UTIL_API bool isDigit(char); ICE_UTIL_API std::string removeWhitespace(const std::string&); } + +#endif diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h index e75adf60476..6658ef8740f 100644 --- a/cpp/include/IceUtil/Thread.h +++ b/cpp/include/IceUtil/Thread.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_THREAD_H +#define ICE_UTIL_THREAD_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -160,3 +161,6 @@ private: typedef Handle<Thread> ThreadPtr; } + +#endif + diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h index b723ff4d4fe..2535fed96c0 100644 --- a/cpp/include/IceUtil/ThreadException.h +++ b/cpp/include/IceUtil/ThreadException.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_THREAD_EXCEPTION_H +#define ICE_UTIL_THREAD_EXCEPTION_H #include <IceUtil/Exception.h> #include <IceUtil/Time.h> @@ -102,3 +103,6 @@ private: }; } + +#endif + diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h index 8dcd0699d4f..d987ca3cd00 100644 --- a/cpp/include/IceUtil/Time.h +++ b/cpp/include/IceUtil/Time.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_TIME_H +#define ICE_UTIL_TIME_H #include <IceUtil/Config.h> @@ -204,3 +205,5 @@ private: ICE_UTIL_API std::ostream& operator<<(std::ostream&, const Time&); } // End namespace IceUtil + +#endif diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h index f6eed95058e..00087365b33 100644 --- a/cpp/include/IceUtil/Timer.h +++ b/cpp/include/IceUtil/Timer.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_TIMER_H +#define ICE_UTIL_TIMER_H #include <IceUtil/Shared.h> #include <IceUtil/Thread.h> @@ -136,3 +137,6 @@ Timer::Token::operator<(const Timer::Token& r) const } } + +#endif + diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h index 838b97d8e4e..4cc1d85f87a 100644 --- a/cpp/include/IceUtil/UUID.h +++ b/cpp/include/IceUtil/UUID.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_UUID_H +#define ICE_UTIL_UUID_H #include <IceUtil/Config.h> @@ -17,3 +18,5 @@ namespace IceUtil ICE_UTIL_API std::string generateUUID(); } + +#endif diff --git a/cpp/include/IceUtil/Unicode.h b/cpp/include/IceUtil/Unicode.h index 4921a5b27ea..7d8df3feff0 100644 --- a/cpp/include/IceUtil/Unicode.h +++ b/cpp/include/IceUtil/Unicode.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_UNICODE_H +#define ICE_UTIL_UNICODE_H #include <IceUtil/Config.h> #include <IceUtil/Exception.h> @@ -90,3 +91,5 @@ convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* std::wstring& target, IceUtil::ConversionFlags flags); } + +#endif diff --git a/cpp/include/IceXML/Parser.h b/cpp/include/IceXML/Parser.h index 28a48daf367..e67478b899d 100644 --- a/cpp/include/IceXML/Parser.h +++ b/cpp/include/IceXML/Parser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_XML_PARSER_H +#define ICE_XML_PARSER_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -152,3 +153,5 @@ public: }; } + +#endif diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h index dae79c161ec..f738f5036c3 100644 --- a/cpp/include/Slice/CPlusPlusUtil.h +++ b/cpp/include/Slice/CPlusPlusUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef C_PLUS_PLUS_UTIL_H +#define C_PLUS_PLUS_UTIL_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -60,3 +61,5 @@ SLICE_API bool inWstringModule(const SequencePtr&); SLICE_API std::string getDataMemberRef(const DataMemberPtr&); } + +#endif diff --git a/cpp/include/Slice/Checksum.h b/cpp/include/Slice/Checksum.h index c874595512f..0a758f5c8a4 100644 --- a/cpp/include/Slice/Checksum.h +++ b/cpp/include/Slice/Checksum.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_CHECKSUM_H +#define SLICE_CHECKSUM_H #include <Slice/Parser.h> #include <map> @@ -21,3 +22,5 @@ typedef std::map<std::string, std::vector<unsigned char> > ChecksumMap; SLICE_API ChecksumMap createChecksums(const UnitPtr&); } + +#endif diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h index 35f21b09094..052ae75dfa7 100644 --- a/cpp/include/Slice/CsUtil.h +++ b/cpp/include/Slice/CsUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef CS_UTIL_H +#define CS_UTIL_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -84,3 +85,5 @@ private: }; } + +#endif diff --git a/cpp/include/Slice/DotNetNames.h b/cpp/include/Slice/DotNetNames.h index 43bab7155c0..88e74c378be 100644 --- a/cpp/include/Slice/DotNetNames.h +++ b/cpp/include/Slice/DotNetNames.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef DOTNETNAMES_H +#define DOTNETNAMES_H #include <string> @@ -29,3 +30,5 @@ std::string mangleName(const std::string&, int baseTypes = 0); } } + +#endif diff --git a/cpp/include/Slice/FileTracker.h b/cpp/include/Slice/FileTracker.h index ba12335da7d..e6dbabdd573 100644 --- a/cpp/include/Slice/FileTracker.h +++ b/cpp/include/Slice/FileTracker.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FILE_TRACKER_H +#define FILE_TRACKER_H #include <IceUtil/Shared.h> #include <Slice/Parser.h> @@ -66,3 +67,5 @@ private: }; } + +#endif diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h index d7023490b78..c8bb6a71f85 100644 --- a/cpp/include/Slice/JavaUtil.h +++ b/cpp/include/Slice/JavaUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef JAVA_UTIL_H +#define JAVA_UTIL_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -266,3 +267,5 @@ private: }; } + +#endif diff --git a/cpp/include/Slice/PHPUtil.h b/cpp/include/Slice/PHPUtil.h index 200cdf57e86..8e0322ffaee 100644 --- a/cpp/include/Slice/PHPUtil.h +++ b/cpp/include/Slice/PHPUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_PHP_UTIL_H +#define SLICE_PHP_UTIL_H #include <Slice/Parser.h> @@ -45,3 +46,5 @@ SLICE_API std::string escapeName(const std::string&); } } + +#endif diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h index 9c82d0c3b76..cb735d70bcc 100644 --- a/cpp/include/Slice/Parser.h +++ b/cpp/include/Slice/Parser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_PARSER_H +#define SLICE_PARSER_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -1069,3 +1070,5 @@ private: extern SLICE_API Unit* unit; // The current parser for bison/flex } + +#endif diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index ee58e8f312c..aa3164e442e 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef PREPROCESSOR_H +#define PREPROCESSOR_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -63,3 +64,5 @@ private: }; } + +#endif diff --git a/cpp/include/Slice/PythonUtil.h b/cpp/include/Slice/PythonUtil.h index 5201b7f1c49..91501cb7f50 100644 --- a/cpp/include/Slice/PythonUtil.h +++ b/cpp/include/Slice/PythonUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_PYTHON_UTIL_H +#define SLICE_PYTHON_UTIL_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -57,3 +58,5 @@ SLICE_API void printHeader(IceUtilInternal::Output&); } } + +#endif diff --git a/cpp/include/Slice/RubyUtil.h b/cpp/include/Slice/RubyUtil.h index acf93455fed..d8cd8ead8b8 100644 --- a/cpp/include/Slice/RubyUtil.h +++ b/cpp/include/Slice/RubyUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_RUBY_UTIL_H +#define SLICE_RUBY_UTIL_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -47,3 +48,5 @@ SLICE_API void printHeader(IceUtilInternal::Output&); } } + +#endif diff --git a/cpp/include/Slice/Util.h b/cpp/include/Slice/Util.h index c4267590cc2..340f3eb6caa 100644 --- a/cpp/include/Slice/Util.h +++ b/cpp/include/Slice/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_UTIL_H +#define SLICE_UTIL_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -28,3 +29,5 @@ SLICE_API std::vector<std::string> filterMcppWarnings(const std::string&); SLICE_API void printGeneratedHeader(IceUtilInternal::Output& out, const std::string&, const std::string& commentStyle = "//"); } + +#endif diff --git a/cpp/src/Freeze/BackgroundSaveEvictorI.h b/cpp/src/Freeze/BackgroundSaveEvictorI.h index 5d8132f9afc..805086a0eca 100644 --- a/cpp/src/Freeze/BackgroundSaveEvictorI.h +++ b/cpp/src/Freeze/BackgroundSaveEvictorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_BACKGROUND_SAVE_EVICTOR_I_H +#define FREEZE_BACKGROUND_SAVE_EVICTOR_I_H #include <Freeze/EvictorI.h> #include <Freeze/BackgroundSaveEvictor.h> @@ -212,3 +213,5 @@ private: }; } + +#endif diff --git a/cpp/src/Freeze/ConnectionI.h b/cpp/src/Freeze/ConnectionI.h index 86cca9d0216..46acecec3ab 100644 --- a/cpp/src/Freeze/ConnectionI.h +++ b/cpp/src/Freeze/ConnectionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_CONNECTIONI_H +#define FREEZE_CONNECTIONI_H #include <Freeze/Connection.h> #include <Freeze/Initialize.h> @@ -167,3 +168,5 @@ ConnectionI::deadlockWarning() const } } + +#endif diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index eb42dbb5951..c2d5d93aa31 100755 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_EVICTOR_I_H +#define FREEZE_EVICTOR_I_H #include <IceUtil/IceUtil.h> #include <Ice/Ice.h> @@ -342,3 +343,5 @@ checkIdentity(const Ice::Identity& ident) } } + +#endif diff --git a/cpp/src/Freeze/EvictorIteratorI.h b/cpp/src/Freeze/EvictorIteratorI.h index 4c740782c32..fd075645f86 100644 --- a/cpp/src/Freeze/EvictorIteratorI.h +++ b/cpp/src/Freeze/EvictorIteratorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_EVICTOR_ITERATOR_I_H +#define FREEZE_EVICTOR_ITERATOR_I_H #include <Ice/Ice.h> #include <Freeze/Freeze.h> @@ -48,3 +49,5 @@ private: }; } + +#endif diff --git a/cpp/src/Freeze/IndexI.h b/cpp/src/Freeze/IndexI.h index 3fe2d6018e0..ea850a3be02 100644 --- a/cpp/src/Freeze/IndexI.h +++ b/cpp/src/Freeze/IndexI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_INDEX_I_H +#define FREEZE_INDEX_I_H #include <Ice/Ice.h> #include <Freeze/Index.h> @@ -48,3 +49,5 @@ private: }; } +#endif + diff --git a/cpp/src/Freeze/MapDb.h b/cpp/src/Freeze/MapDb.h index c158b4de1d5..5bc9a6f6373 100644 --- a/cpp/src/Freeze/MapDb.h +++ b/cpp/src/Freeze/MapDb.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_MAP_DB_H +#define FREEZE_MAP_DB_H #include <IceUtil/Config.h> #include <db_cxx.h> @@ -119,3 +120,4 @@ MapDb::getKeyCompare() const } } +#endif diff --git a/cpp/src/Freeze/MapI.h b/cpp/src/Freeze/MapI.h index 89583728ce8..dc1e421d97a 100644 --- a/cpp/src/Freeze/MapI.h +++ b/cpp/src/Freeze/MapI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_MAP_I_H +#define FREEZE_MAP_I_H #include <Freeze/Map.h> #include <Freeze/ConnectionI.h> @@ -186,3 +187,5 @@ IteratorHelperI::tx() const } } + +#endif diff --git a/cpp/src/Freeze/ObjectStore.h b/cpp/src/Freeze/ObjectStore.h index ff2574fa931..cb69c38a1c0 100644 --- a/cpp/src/Freeze/ObjectStore.h +++ b/cpp/src/Freeze/ObjectStore.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_OBJECT_STORE_H +#define FREEZE_OBJECT_STORE_H #include <Ice/Ice.h> #include <Ice/Identity.h> @@ -171,3 +172,6 @@ ObjectStoreBase::sampleServant() const } } + +#endif + diff --git a/cpp/src/Freeze/SharedDbEnv.h b/cpp/src/Freeze/SharedDbEnv.h index 53c54988bb7..0afd4b9098f 100644 --- a/cpp/src/Freeze/SharedDbEnv.h +++ b/cpp/src/Freeze/SharedDbEnv.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SHARED_DB_ENV_H +#define FREEZE_SHARED_DB_ENV_H #include <Freeze/Map.h> #include <IceUtil/FileUtil.h> @@ -126,3 +127,4 @@ SharedDbEnv::getEncoding() const } } +#endif diff --git a/cpp/src/Freeze/TransactionI.h b/cpp/src/Freeze/TransactionI.h index 993a50d4ae8..456e9f9b883 100644 --- a/cpp/src/Freeze/TransactionI.h +++ b/cpp/src/Freeze/TransactionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_TRANSACTIONI_H +#define FREEZE_TRANSACTIONI_H #include <Ice/CommunicatorF.h> #include <Freeze/Transaction.h> @@ -84,3 +85,4 @@ private: typedef IceUtil::Handle<TransactionI> TransactionIPtr; } +#endif diff --git a/cpp/src/Freeze/TransactionalEvictorContext.h b/cpp/src/Freeze/TransactionalEvictorContext.h index 45a6afd1074..0278d6f5ad3 100644 --- a/cpp/src/Freeze/TransactionalEvictorContext.h +++ b/cpp/src/Freeze/TransactionalEvictorContext.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_TRANSACTIONAL_EVICTOR_CONTEXT_H +#define FREEZE_TRANSACTIONAL_EVICTOR_CONTEXT_H #include <Ice/Ice.h> #include <Freeze/TransactionalEvictor.h> @@ -163,3 +164,6 @@ private: typedef IceUtil::Handle<TransactionalEvictorContext> TransactionalEvictorContextPtr; } + + +#endif diff --git a/cpp/src/Freeze/TransactionalEvictorI.h b/cpp/src/Freeze/TransactionalEvictorI.h index 73c140b0db4..d8c9a9375d4 100644 --- a/cpp/src/Freeze/TransactionalEvictorI.h +++ b/cpp/src/Freeze/TransactionalEvictorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_TRANSACTIONAL_EVICTOR_I_H +#define FREEZE_TRANSACTIONAL_EVICTOR_I_H #include <Freeze/EvictorI.h> #include <Freeze/TransactionalEvictor.h> @@ -123,3 +124,5 @@ private: typedef IceUtil::Handle<TransactionalEvictorI> TransactionalEvictorIPtr; } + +#endif diff --git a/cpp/src/Freeze/Util.h b/cpp/src/Freeze/Util.h index f848e873bd2..9423a707f6f 100644 --- a/cpp/src/Freeze/Util.h +++ b/cpp/src/Freeze/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_UTIL_H +#define FREEZE_UTIL_H #include <Ice/Ice.h> #include <Freeze/DB.h> @@ -67,3 +68,7 @@ handleDbException(const DbException&, Key&, Dbt&, Value&, Dbt&, const char*, int); } + + +#endif + diff --git a/cpp/src/FreezeScript/AssignVisitor.h b/cpp/src/FreezeScript/AssignVisitor.h index 71f9091967c..388dde01b60 100644 --- a/cpp/src/FreezeScript/AssignVisitor.h +++ b/cpp/src/FreezeScript/AssignVisitor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_ASSIGN_VISITOR_H +#define FREEZE_SCRIPT_ASSIGN_VISITOR_H #include <FreezeScript/Data.h> @@ -49,3 +50,5 @@ private: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Data.h b/cpp/src/FreezeScript/Data.h index 7f2524f06df..6e4e24a0168 100644 --- a/cpp/src/FreezeScript/Data.h +++ b/cpp/src/FreezeScript/Data.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_DATA_H +#define FREEZE_SCRIPT_DATA_H #include <Ice/Ice.h> #include <Slice/Parser.h> @@ -613,3 +614,5 @@ public: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/DumpDescriptors.h b/cpp/src/FreezeScript/DumpDescriptors.h index a4d900df06c..25af7437a0f 100644 --- a/cpp/src/FreezeScript/DumpDescriptors.h +++ b/cpp/src/FreezeScript/DumpDescriptors.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_DUMP_DESCRIPTORS_H +#define FREEZE_SCRIPT_DUMP_DESCRIPTORS_H #include <FreezeScript/Parser.h> #include <IceXML/Parser.h> @@ -301,3 +302,5 @@ private: typedef IceUtil::Handle<DumpDBDescriptor> DumpDBDescriptorPtr; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Error.h b/cpp/src/FreezeScript/Error.h index 4cbf3ff2272..8e52a549cbd 100644 --- a/cpp/src/FreezeScript/Error.h +++ b/cpp/src/FreezeScript/Error.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_ERROR_H +#define FREEZE_SCRIPT_ERROR_H #include <Slice/Parser.h> @@ -63,3 +64,5 @@ private: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Exception.h b/cpp/src/FreezeScript/Exception.h index b5f5e8c8c2c..6486c5958c4 100644 --- a/cpp/src/FreezeScript/Exception.h +++ b/cpp/src/FreezeScript/Exception.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_EXCEPTION_H +#define FREEZE_SCRIPT_EXCEPTION_H #include <IceUtil/Exception.h> @@ -34,3 +35,5 @@ private: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Functions.h b/cpp/src/FreezeScript/Functions.h index c1194051e3b..d3b63146ba7 100644 --- a/cpp/src/FreezeScript/Functions.h +++ b/cpp/src/FreezeScript/Functions.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_FUNCTIONS_H +#define FREEZE_SCRIPT_FUNCTIONS_H #include <FreezeScript/Data.h> @@ -21,3 +22,5 @@ bool invokeMemberFunction(const std::string&, const DataPtr&, const DataList&, D const ErrorReporterPtr&); } + +#endif diff --git a/cpp/src/FreezeScript/GrammarUtil.h b/cpp/src/FreezeScript/GrammarUtil.h index 9b42a92351a..2ca8fa22eda 100644 --- a/cpp/src/FreezeScript/GrammarUtil.h +++ b/cpp/src/FreezeScript/GrammarUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_GRAMMAR_UTIL_H +#define FREEZE_SCRIPT_GRAMMAR_UTIL_H #include <FreezeScript/Parser.h> @@ -131,3 +132,5 @@ int freeze_script_parse(); // yyoverflow. // #define yyoverflow(a, b, c, d, e, f) freeze_script_error(a) + +#endif diff --git a/cpp/src/FreezeScript/Parser.h b/cpp/src/FreezeScript/Parser.h index e5c79800fb8..83e2a74fce2 100644 --- a/cpp/src/FreezeScript/Parser.h +++ b/cpp/src/FreezeScript/Parser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_PARSER_H +#define FREEZE_SCRIPT_PARSER_H #include <FreezeScript/Data.h> @@ -246,3 +247,5 @@ private: } // End of namespace FreezeScript std::ostream& operator<<(std::ostream&, const FreezeScript::EntityNodePtr&); + +#endif diff --git a/cpp/src/FreezeScript/Print.h b/cpp/src/FreezeScript/Print.h index ce548612c77..6d6d57efbd1 100644 --- a/cpp/src/FreezeScript/Print.h +++ b/cpp/src/FreezeScript/Print.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_PRINT_H +#define FREEZE_SCRIPT_PRINT_H #include <FreezeScript/Data.h> @@ -17,3 +18,5 @@ namespace FreezeScript void printData(const DataPtr&, std::ostream&); } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Scanner.cpp b/cpp/src/FreezeScript/Scanner.cpp index 6b9c34b3314..c759d4012bc 100644 --- a/cpp/src/FreezeScript/Scanner.cpp +++ b/cpp/src/FreezeScript/Scanner.cpp @@ -74,6 +74,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -104,8 +105,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -162,15 +161,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -563,6 +554,16 @@ char *freeze_script_text; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef freeze_script_wrap +# undef freeze_script_wrap +# define freeze_script_wrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + using namespace std; using namespace FreezeScript; @@ -581,7 +582,7 @@ StringTokPtr parseString(char); #define YY_USER_INIT initScanner(); #define YY_INPUT(buf, result, max_size) { result = getInput(buf, max_size); } -#line 584 "lex.yy.c" +#line 585 "lex.yy.c" #define INITIAL 0 @@ -662,12 +663,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -675,7 +671,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( freeze_script_text, freeze_script_leng, 1, freeze_script_out )) {} } while (0) +#define ECHO fwrite( freeze_script_text, freeze_script_leng, 1, freeze_script_out ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -686,7 +682,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( freeze_script_in )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -768,10 +764,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 73 "Scanner.l" +#line 83 "Scanner.l" -#line 774 "lex.yy.c" +#line 770 "lex.yy.c" if ( !(yy_init) ) { @@ -852,7 +848,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 75 "Scanner.l" +#line 85 "Scanner.l" { // C++-style comment int c; @@ -869,7 +865,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 89 "Scanner.l" +#line 99 "Scanner.l" { // C-style comment while(true) @@ -901,7 +897,7 @@ YY_RULE_SETUP YY_BREAK case 3: YY_RULE_SETUP -#line 118 "Scanner.l" +#line 128 "Scanner.l" { StringTokPtr ident = new StringTok; ident->v = freeze_script_text; @@ -911,7 +907,7 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 125 "Scanner.l" +#line 135 "Scanner.l" { StringTokPtr str = parseString('"'); *yylvalp = str; @@ -920,7 +916,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 131 "Scanner.l" +#line 141 "Scanner.l" { StringTokPtr str = parseString('\''); *yylvalp = str; @@ -929,7 +925,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 137 "Scanner.l" +#line 147 "Scanner.l" { IntegerTokPtr itp = new IntegerTok; *yylvalp = itp; @@ -946,7 +942,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 151 "Scanner.l" +#line 161 "Scanner.l" { errno = 0; FloatingTokPtr ftp = new FloatingTok; @@ -978,7 +974,7 @@ YY_RULE_SETUP case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 179 "Scanner.l" +#line 189 "Scanner.l" { // Igore white-space @@ -990,97 +986,97 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 188 "Scanner.l" +#line 198 "Scanner.l" return TOK_LESS_THAN; YY_BREAK case 10: YY_RULE_SETUP -#line 189 "Scanner.l" +#line 199 "Scanner.l" return TOK_GREATER_THAN; YY_BREAK case 11: YY_RULE_SETUP -#line 190 "Scanner.l" +#line 200 "Scanner.l" return TOK_LESS_EQUAL; YY_BREAK case 12: YY_RULE_SETUP -#line 191 "Scanner.l" +#line 201 "Scanner.l" return TOK_GREATER_EQUAL; YY_BREAK case 13: YY_RULE_SETUP -#line 192 "Scanner.l" +#line 202 "Scanner.l" return TOK_EQUAL; YY_BREAK case 14: YY_RULE_SETUP -#line 193 "Scanner.l" +#line 203 "Scanner.l" return TOK_NEQ; YY_BREAK case 15: YY_RULE_SETUP -#line 194 "Scanner.l" +#line 204 "Scanner.l" return TOK_ADD; YY_BREAK case 16: YY_RULE_SETUP -#line 195 "Scanner.l" +#line 205 "Scanner.l" return TOK_SUB; YY_BREAK case 17: YY_RULE_SETUP -#line 196 "Scanner.l" +#line 206 "Scanner.l" return TOK_MUL; YY_BREAK case 18: YY_RULE_SETUP -#line 197 "Scanner.l" +#line 207 "Scanner.l" return TOK_DIV; YY_BREAK case 19: YY_RULE_SETUP -#line 198 "Scanner.l" +#line 208 "Scanner.l" return TOK_MOD; YY_BREAK case 20: YY_RULE_SETUP -#line 199 "Scanner.l" +#line 209 "Scanner.l" return TOK_LPAREN; YY_BREAK case 21: YY_RULE_SETUP -#line 200 "Scanner.l" +#line 210 "Scanner.l" return TOK_RPAREN; YY_BREAK case 22: YY_RULE_SETUP -#line 201 "Scanner.l" +#line 211 "Scanner.l" return TOK_LBRACKET; YY_BREAK case 23: YY_RULE_SETUP -#line 202 "Scanner.l" +#line 212 "Scanner.l" return TOK_RBRACKET; YY_BREAK case 24: YY_RULE_SETUP -#line 203 "Scanner.l" +#line 213 "Scanner.l" return TOK_SCOPE_DELIMITER; YY_BREAK case 25: YY_RULE_SETUP -#line 205 "Scanner.l" +#line 215 "Scanner.l" { return freeze_script_text[0]; } YY_BREAK case 26: YY_RULE_SETUP -#line 209 "Scanner.l" +#line 219 "Scanner.l" ECHO; YY_BREAK -#line 1083 "lex.yy.c" +#line 1079 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1835,8 +1831,8 @@ YY_BUFFER_STATE freeze_script__scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to freeze_script_lex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -2075,7 +2071,7 @@ void freeze_script_free (void * ptr ) #define YYTABLES_NAME "yytables" -#line 209 "Scanner.l" +#line 219 "Scanner.l" diff --git a/cpp/src/FreezeScript/Scanner.l b/cpp/src/FreezeScript/Scanner.l index 81974e656b5..badad602828 100644 --- a/cpp/src/FreezeScript/Scanner.l +++ b/cpp/src/FreezeScript/Scanner.l @@ -39,6 +39,16 @@ # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef freeze_script_wrap +# undef freeze_script_wrap +# define freeze_script_wrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + using namespace std; using namespace FreezeScript; diff --git a/cpp/src/FreezeScript/TransformAnalyzer.h b/cpp/src/FreezeScript/TransformAnalyzer.h index 1ebbf1a91a6..2d0d5719bcc 100644 --- a/cpp/src/FreezeScript/TransformAnalyzer.h +++ b/cpp/src/FreezeScript/TransformAnalyzer.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_TRANSFORM_ANALYZER_H +#define FREEZE_SCRIPT_TRANSFORM_ANALYZER_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -39,3 +40,5 @@ private: }; } + +#endif diff --git a/cpp/src/FreezeScript/TransformVisitor.h b/cpp/src/FreezeScript/TransformVisitor.h index 1a53d7954ca..c1365e340a1 100644 --- a/cpp/src/FreezeScript/TransformVisitor.h +++ b/cpp/src/FreezeScript/TransformVisitor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_TRANSFORM_VISITOR_H +#define FREEZE_SCRIPT_TRANSFORM_VISITOR_H #include <FreezeScript/Data.h> @@ -115,3 +116,5 @@ private: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Transformer.h b/cpp/src/FreezeScript/Transformer.h index 323f285c26a..724688b11de 100644 --- a/cpp/src/FreezeScript/Transformer.h +++ b/cpp/src/FreezeScript/Transformer.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_TRANSFORMER_H +#define FREEZE_SCRIPT_TRANSFORMER_H #include <Ice/Ice.h> #include <Slice/Parser.h> @@ -28,3 +29,5 @@ transformDatabase(const Ice::CommunicatorPtr&, std::ostream&, bool, std::istream&); } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Util.h b/cpp/src/FreezeScript/Util.h index cb81adf7b8f..4ad93167c7e 100644 --- a/cpp/src/FreezeScript/Util.h +++ b/cpp/src/FreezeScript/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_UTIL_H +#define FREEZE_SCRIPT_UTIL_H #include <Slice/Parser.h> #include <Ice/CommunicatorF.h> @@ -62,3 +63,5 @@ typedef std::map<std::string, Freeze::CatalogData> CatalogDataMap; CatalogDataMap readCatalog(const Ice::CommunicatorPtr&, const std::string&); } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/Glacier2/Blobject.h b/cpp/src/Glacier2/Blobject.h index dff1fbe91ca..3bdea766b46 100644 --- a/cpp/src/Glacier2/Blobject.h +++ b/cpp/src/Glacier2/Blobject.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef BLOBJECT_H +#define BLOBJECT_H #include <Ice/Ice.h> #include <Glacier2/RequestQueue.h> @@ -69,3 +70,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/ClientBlobject.h b/cpp/src/Glacier2/ClientBlobject.h index 0e1143051b6..0dcf4c728e4 100644 --- a/cpp/src/Glacier2/ClientBlobject.h +++ b/cpp/src/Glacier2/ClientBlobject.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef CLIENT_BLOBJECT_H +#define CLIENT_BLOBJECT_H #include <Glacier2/Blobject.h> #include <Glacier2/Session.h> @@ -49,3 +50,5 @@ private: const int _rejectTraceLevel; }; } + +#endif diff --git a/cpp/src/Glacier2/CryptPermissionsVerifierI.h b/cpp/src/Glacier2/CryptPermissionsVerifierI.h index b7a61847c62..143c1afa1d9 100644 --- a/cpp/src/Glacier2/CryptPermissionsVerifierI.h +++ b/cpp/src/Glacier2/CryptPermissionsVerifierI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_CRYPT_PERMISSIONS_VERIFIER_I_H +#define GLACIER2_CRYPT_PERMISSIONS_VERIFIER_I_H #include <Ice/Ice.h> #include <Glacier2/PermissionsVerifier.h> @@ -29,3 +30,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/FilterI.h b/cpp/src/Glacier2/FilterI.h index 20a9cb873c8..e2c81f0f221 100644 --- a/cpp/src/Glacier2/FilterI.h +++ b/cpp/src/Glacier2/FilterI.h @@ -6,8 +6,8 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** - -#pragma once +#ifndef FILTER_I_H +#define FILTER_I_H #include <Glacier2/Session.h> @@ -176,3 +176,5 @@ typedef FilterT<std::string, Glacier2::StringSet> StringSetI; typedef IceUtil::Handle< FilterT<std::string, Glacier2::StringSet> > StringSetIPtr; }; + +#endif diff --git a/cpp/src/Glacier2/FilterManager.h b/cpp/src/Glacier2/FilterManager.h index 0c0e8108981..0506c9c197b 100644 --- a/cpp/src/Glacier2/FilterManager.h +++ b/cpp/src/Glacier2/FilterManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FILTER_MANAGER_H +#define FILTER_MANAGER_H // // It'd be better if we didn't have to include this everywhere, but @@ -83,3 +84,6 @@ private: FilterManager(const InstancePtr& , const StringSetIPtr&, const StringSetIPtr&, const IdentitySetIPtr&); }; }; + +#endif /* FILTER_MANAGER_H */ + diff --git a/cpp/src/Glacier2/Instance.h b/cpp/src/Glacier2/Instance.h index 4bde3b585db..fe49c0ddcad 100644 --- a/cpp/src/Glacier2/Instance.h +++ b/cpp/src/Glacier2/Instance.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_INSTANCE_H +#define GLACIER2_INSTANCE_H #include <Ice/CommunicatorF.h> #include <Ice/ObjectAdapterF.h> @@ -59,3 +60,5 @@ private: typedef IceUtil::Handle<Instance> InstancePtr; } // End namespace Glacier2 + +#endif diff --git a/cpp/src/Glacier2/ProxyVerifier.h b/cpp/src/Glacier2/ProxyVerifier.h index 38133aaa271..9a281d7f176 100644 --- a/cpp/src/Glacier2/ProxyVerifier.h +++ b/cpp/src/Glacier2/ProxyVerifier.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROXY_VERIFIER_H +#define ICE_PROXY_VERIFIER_H #include <Ice/Ice.h> #include <vector> @@ -55,3 +56,4 @@ private: typedef IceUtil::Handle<ProxyVerifier> ProxyVerifierPtr; } +#endif diff --git a/cpp/src/Glacier2/RequestQueue.h b/cpp/src/Glacier2/RequestQueue.h index 5fecdff2879..949b6bf1b2a 100644 --- a/cpp/src/Glacier2/RequestQueue.h +++ b/cpp/src/Glacier2/RequestQueue.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef REQUEST_H +#define REQUEST_H #include <IceUtil/Thread.h> #include <IceUtil/Monitor.h> @@ -113,3 +114,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/RouterI.h b/cpp/src/Glacier2/RouterI.h index 30ddb91024e..be4a9f26201 100644 --- a/cpp/src/Glacier2/RouterI.h +++ b/cpp/src/Glacier2/RouterI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_ROUTER_I_H +#define GLACIER2_ROUTER_I_H #include <Ice/Ice.h> #include <Glacier2/Router.h> @@ -74,3 +75,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/RoutingTable.h b/cpp/src/Glacier2/RoutingTable.h index b49894d4e49..20ab0b0d212 100644 --- a/cpp/src/Glacier2/RoutingTable.h +++ b/cpp/src/Glacier2/RoutingTable.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ROUTING_TABLE_H +#define ICE_ROUTING_TABLE_H #include <Ice/Ice.h> #include <IceUtil/Mutex.h> @@ -54,3 +55,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/ServerBlobject.h b/cpp/src/Glacier2/ServerBlobject.h index 56fabf9e88f..2d1481e44a4 100644 --- a/cpp/src/Glacier2/ServerBlobject.h +++ b/cpp/src/Glacier2/ServerBlobject.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SERVER_BLOBJECT_H +#define SERVER_BLOBJECT_H #include <Glacier2/Blobject.h> @@ -29,3 +30,5 @@ public: }; } + +#endif diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h index ecf6ff120fc..916e9f58a8d 100644 --- a/cpp/src/Glacier2/SessionRouterI.h +++ b/cpp/src/Glacier2/SessionRouterI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_SESSION_ROUTER_I_H +#define GLACIER2_SESSION_ROUTER_I_H #include <IceUtil/Thread.h> #include <IceUtil/Monitor.h> @@ -162,3 +163,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2Lib/Makefile b/cpp/src/Glacier2Lib/Makefile index cc3ab417519..7f5353822e3 100644 --- a/cpp/src/Glacier2Lib/Makefile +++ b/cpp/src/Glacier2Lib/Makefile @@ -37,7 +37,7 @@ SDIR = $(slicedir)/Glacier2 include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) +CPPFLAGS := -I.. $(CPPFLAGS) $(OPENSSL_FLAGS) -DGLACIER2_API_EXPORTS SLICE2CPPFLAGS := --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS) LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h index bc6dba9c43c..27fdba1a1cb 100644 --- a/cpp/src/Ice/Acceptor.h +++ b/cpp/src/Ice/Acceptor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ACCEPTOR_H +#define ICE_ACCEPTOR_H #include <IceUtil/Shared.h> #include <Ice/AcceptorF.h> @@ -33,3 +34,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h index d1dd06c669e..6e2bc1d60f8 100644 --- a/cpp/src/Ice/AcceptorF.h +++ b/cpp/src/Ice/AcceptorF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ACCEPTOR_F_H +#define ICE_ACCEPTOR_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(Acceptor*); typedef Handle<Acceptor> AcceptorPtr; } + +#endif diff --git a/cpp/src/Ice/Base64.h b/cpp/src/Ice/Base64.h index 0de84d1b15c..64d16c04823 100644 --- a/cpp/src/Ice/Base64.h +++ b/cpp/src/Ice/Base64.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_BASE_64_H +#define ICE_BASE_64_H #include <Ice/Config.h> #include <string> @@ -31,3 +32,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 384a6a7936c..799f24875b0 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_COMMUNICATOR_I_H +#define ICE_COMMUNICATOR_I_H #include <IceUtil/RecMutex.h> @@ -109,3 +110,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h index 35a9fe87216..491d5b6639a 100644 --- a/cpp/src/Ice/ConnectRequestHandler.h +++ b/cpp/src/Ice/ConnectRequestHandler.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECT_REQUEST_HANDLER_H +#define ICE_CONNECT_REQUEST_HANDLER_H #include <IceUtil/Monitor.h> #include <IceUtil/Mutex.h> @@ -88,3 +89,5 @@ private: typedef IceUtil::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr; } + +#endif diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index 1d9ad366efd..60c615282d0 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_FACTORY_H +#define ICE_CONNECTION_FACTORY_H #include <IceUtil/Mutex.h> #include <IceUtil/Monitor.h> @@ -228,3 +229,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 8a8ceb67116..4ca2941ab67 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_I_H +#define ICE_CONNECTION_I_H #include <IceUtil/Mutex.h> #include <IceUtil/Monitor.h> @@ -370,3 +371,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ConnectionMonitor.h b/cpp/src/Ice/ConnectionMonitor.h index 19e8a353280..5f09f67405f 100644 --- a/cpp/src/Ice/ConnectionMonitor.h +++ b/cpp/src/Ice/ConnectionMonitor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_MONITOR_H +#define ICE_CONNECTION_MONITOR_H #include <IceUtil/Mutex.h> #include <IceUtil/Monitor.h> @@ -46,3 +47,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h index c05f7d8bf5a..45b5678d35f 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.h +++ b/cpp/src/Ice/ConnectionRequestHandler.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_REQUEST_HANDLER_H +#define ICE_CONNECTION_REQUEST_HANDLER_H #include <Ice/RequestHandler.h> #include <Ice/ReferenceF.h> @@ -42,3 +43,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h index 79e7060421a..58bd62bf900 100644 --- a/cpp/src/Ice/Connector.h +++ b/cpp/src/Ice/Connector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTOR_H +#define ICE_CONNECTOR_H #include <IceUtil/Shared.h> #include <Ice/ConnectorF.h> @@ -31,3 +32,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h index 91318a048df..0e7872c4dbf 100644 --- a/cpp/src/Ice/ConnectorF.h +++ b/cpp/src/Ice/ConnectorF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTOR_F_H +#define ICE_CONNECTOR_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(Connector*); typedef Handle<Connector> ConnectorPtr; } + +#endif diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h index b0d7dee0f59..d2f624470d1 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.h +++ b/cpp/src/Ice/DefaultsAndOverrides.h @@ -8,7 +8,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DEFAULTS_AND_OVERRIDES_H +#define ICE_DEFAULTS_AND_OVERRIDES_H #include <IceUtil/Shared.h> #include <Ice/DefaultsAndOverridesF.h> @@ -47,3 +48,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/DefaultsAndOverridesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h index 845e2c0ca4a..9d2b40287c4 100644 --- a/cpp/src/Ice/DefaultsAndOverridesF.h +++ b/cpp/src/Ice/DefaultsAndOverridesF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H +#define ICE_DEFAULTS_AND_OVERRIDES_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(DefaultsAndOverrides*); typedef Handle<DefaultsAndOverrides> DefaultsAndOverridesPtr; } + +#endif diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h index cc8e5fdb21a..89bdc493cef 100644 --- a/cpp/src/Ice/EndpointFactoryManager.h +++ b/cpp/src/Ice/EndpointFactoryManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ENDPOINT_FACTORY_MANAGER_H +#define ICE_ENDPOINT_FACTORY_MANAGER_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -42,3 +43,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/EndpointFactoryManagerF.h b/cpp/src/Ice/EndpointFactoryManagerF.h index 570249ed5e7..9123c7dec89 100644 --- a/cpp/src/Ice/EndpointFactoryManagerF.h +++ b/cpp/src/Ice/EndpointFactoryManagerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ENDPOINT_FACTORY_MANAGER_F_H +#define ICE_ENDPOINT_FACTORY_MANAGER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(EndpointFactoryManager*); typedef Handle<EndpointFactoryManager> EndpointFactoryManagerPtr; } + +#endif diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index 95137fe7014..164c55b086a 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ENDPOINT_I_H +#define ICE_ENDPOINT_I_H #include <IceUtil/Config.h> #include <IceUtil/Shared.h> @@ -222,3 +223,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h index 04200f2d29e..fdb0f6d31f2 100644 --- a/cpp/src/Ice/EventHandler.h +++ b/cpp/src/Ice/EventHandler.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_EVENT_HANDLER_H +#define ICE_EVENT_HANDLER_H #include <IceUtil/Shared.h> #include <Ice/EventHandlerF.h> @@ -71,3 +72,5 @@ protected: }; } + +#endif diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h index 3947e19ca6f..9b16cb492dc 100644 --- a/cpp/src/Ice/EventHandlerF.h +++ b/cpp/src/Ice/EventHandlerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_EVENT_HANDLER_F_H +#define ICE_EVENT_HANDLER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(EventHandler*); typedef Handle<EventHandler> EventHandlerPtr; } + +#endif diff --git a/cpp/src/Ice/EventLoggerMsg.h b/cpp/src/Ice/EventLoggerMsg.h index be8c37e8213..5934c1f104f 100755 --- a/cpp/src/Ice/EventLoggerMsg.h +++ b/cpp/src/Ice/EventLoggerMsg.h @@ -1,11 +1,11 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** + // ********************************************************************** + // + // Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved. + // + // This copy of Ice is licensed to you under the terms described in the + // ICE_LICENSE file included in this distribution. + // + // ********************************************************************** // // Values are 32 bit values laid out as follows: // diff --git a/cpp/src/Ice/GC.h b/cpp/src/Ice/GC.h index 65ee1f47750..1d8b2986fa0 100644 --- a/cpp/src/Ice/GC.h +++ b/cpp/src/Ice/GC.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GC_H +#define ICE_GC_H #include <Ice/Config.h> #include <IceUtil/Thread.h> @@ -49,3 +50,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/HashUtil.h b/cpp/src/Ice/HashUtil.h index d23ee90ff0c..299f3dd0246 100644 --- a/cpp/src/Ice/HashUtil.h +++ b/cpp/src/Ice/HashUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_HASH_UTIL_H +#define ICE_HASH_UTIL_H namespace IceInternal { @@ -53,3 +54,6 @@ hashAdd(Ice::Int& hashCode, const std::map<K, V>& map) } } + +#endif + diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp index 9da2940ff6c..86118533e67 100644 --- a/cpp/src/Ice/ImplicitContextI.cpp +++ b/cpp/src/Ice/ImplicitContextI.cpp @@ -55,9 +55,6 @@ public: virtual void write(const Context&, ::IceInternal::BasicStream*) const; virtual void combine(const Context&, Context&) const; - - static void threadDestructor(void*); - struct Slot { @@ -104,6 +101,9 @@ private: #endif } +extern "C" void iceImplicitContextThreadDestructor(void*); + + /*static*/ ImplicitContextI* ImplicitContextI::create(const std::string& kind) @@ -141,8 +141,7 @@ ImplicitContextI::cleanupThread() { if(PerThreadImplicitContext::_nextId > 0) { - PerThreadImplicitContext::threadDestructor( - TlsGetValue(PerThreadImplicitContext::_key)); + iceImplicitContextThreadDestructor(TlsGetValue(PerThreadImplicitContext::_key)); } } #endif @@ -310,7 +309,7 @@ PerThreadImplicitContext::PerThreadImplicitContext() throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError()); } # else - int err = pthread_key_create(&_key, &threadDestructor); + int err = pthread_key_create(&_key, &iceImplicitContextThreadDestructor); if(err != 0) { throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, err); @@ -351,26 +350,6 @@ PerThreadImplicitContext::~PerThreadImplicitContext() } } -/*static*/ void -PerThreadImplicitContext::threadDestructor(void* v) -{ - SlotVector* sv = static_cast<SlotVector*>(v); - if(sv != 0) - { - // - // Cleanup each slot - // - for(SlotVector::iterator p = sv->begin(); p != sv->end(); ++p) - { - delete p->context; - } - // - // Then the vector - // - delete sv; - } -} - Context* PerThreadImplicitContext::getThreadContext(bool allocate) const { @@ -635,4 +614,24 @@ PerThreadImplicitContext::combine(const Context& proxyCtx, Context& ctx) const ctx.insert(threadCtx->begin(), threadCtx->end()); } } + +extern "C" void iceImplicitContextThreadDestructor(void* v) +{ + PerThreadImplicitContext::SlotVector* sv = static_cast<PerThreadImplicitContext::SlotVector*>(v); + if(sv != 0) + { + // + // Cleanup each slot + // + for(PerThreadImplicitContext::SlotVector::iterator p = sv->begin(); p != sv->end(); ++p) + { + delete p->context; + } + // + // Then the vector + // + delete sv; + } +} + #endif diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h index b781db796bc..8125f7a92a3 100644 --- a/cpp/src/Ice/ImplicitContextI.h +++ b/cpp/src/Ice/ImplicitContextI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_IMPLICIT_CONTEXT_I_H +#define ICE_IMPLICIT_CONTEXT_I_H #include <Ice/ImplicitContext.h> @@ -47,3 +48,4 @@ public: typedef IceInternal::Handle<ImplicitContextI> ImplicitContextIPtr; } +#endif diff --git a/cpp/src/Ice/IncomingRequest.h b/cpp/src/Ice/IncomingRequest.h index 2cb1ca7e785..b163c86a39a 100644 --- a/cpp/src/Ice/IncomingRequest.h +++ b/cpp/src/Ice/IncomingRequest.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_INCOMING_REQUEST_H +#define ICE_INCOMING_REQUEST_H #include <Ice/Incoming.h> #include <Ice/Object.h> @@ -33,3 +34,5 @@ public: Incoming& _in; }; } + +#endif diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index c7799aec36b..4744c83ca07 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_INSTANCE_H +#define ICE_INSTANCE_H #include <IceUtil/Config.h> #include <IceUtil/Shared.h> @@ -160,3 +161,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h index 09f114663cc..5a4dc897f07 100644 --- a/cpp/src/Ice/LocatorInfo.h +++ b/cpp/src/Ice/LocatorInfo.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_LOCATOR_INFO_H +#define ICE_LOCATOR_INFO_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -181,3 +182,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h index 817aa6cb651..3666e182700 100644 --- a/cpp/src/Ice/LocatorInfoF.h +++ b/cpp/src/Ice/LocatorInfoF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_LOCATOR_INFO_F_H +#define ICE_LOCATOR_INFO_F_H #include <IceUtil/Shared.h> @@ -29,3 +30,5 @@ IceUtil::Shared* upCast(LocatorTable*); typedef Handle<LocatorTable> LocatorTablePtr; } + +#endif diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h index 6f1ce6457b0..dfab4451764 100644 --- a/cpp/src/Ice/LoggerI.h +++ b/cpp/src/Ice/LoggerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_LOGGER_I_H +#define ICE_LOGGER_I_H #include <Ice/Logger.h> #include <IceUtil/FileUtil.h> @@ -40,3 +41,5 @@ private: typedef IceUtil::Handle<LoggerI> LoggerIPtr; } + +#endif diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 9ab03d9827c..84474c61bac 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -64,10 +64,6 @@ using namespace Windows::Networking; using namespace Windows::Networking::Sockets; #endif -#if defined(__sun) && !defined(__GNUC__) -# define INADDR_NONE (in_addr_t)0xffffffff -#endif - namespace { @@ -1128,11 +1124,11 @@ IceInternal::inetAddrToString(const Address& ss) int size = 0; if(ss.ss_family == AF_INET) { - size = sizeof(sockaddr_in); + size = static_cast<int>(sizeof(sockaddr_in)); } else if(ss.ss_family == AF_INET6) { - size = sizeof(sockaddr_in6); + size = static_cast<int>(sizeof(sockaddr_in6)); } else { @@ -1141,7 +1137,7 @@ IceInternal::inetAddrToString(const Address& ss) char namebuf[1024]; namebuf[0] = '\0'; - getnameinfo(reinterpret_cast<const struct sockaddr *>(&ss), size, namebuf, sizeof(namebuf), 0, 0, NI_NUMERICHOST); + getnameinfo(reinterpret_cast<const struct sockaddr *>(&ss), size, namebuf, static_cast<socklen_t>(sizeof(namebuf)), 0, 0, NI_NUMERICHOST); return string(namebuf); #else if(ss.host == nullptr) @@ -1626,11 +1622,11 @@ IceInternal::doBind(SOCKET fd, const Address& addr) int size; if(addr.ss_family == AF_INET) { - size = sizeof(sockaddr_in); + size = static_cast<int>(sizeof(sockaddr_in)); } else if(addr.ss_family == AF_INET6) { - size = sizeof(sockaddr_in6); + size = static_cast<int>(sizeof(sockaddr_in6)); } else { @@ -1842,11 +1838,11 @@ repeatConnect: int size; if(addr.ss_family == AF_INET) { - size = sizeof(sockaddr_in); + size = static_cast<int>(sizeof(sockaddr_in)); } else if(addr.ss_family == AF_INET6) { - size = sizeof(sockaddr_in6); + size = static_cast<int>(sizeof(sockaddr_in6)); } else { diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h index 1643c5eae8f..6103f98f109 100644 --- a/cpp/src/Ice/Network.h +++ b/cpp/src/Ice/Network.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_NETWORK_H +#define ICE_NETWORK_H #ifdef __hpux # define _XOPEN_SOURCE_EXTENDED @@ -253,3 +254,5 @@ ICE_API void doConnectAsync(SOCKET, const Address&, AsyncInfo&); ICE_API void doFinishConnectAsync(SOCKET, AsyncInfo&); #endif } + +#endif diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h index 92f7d584db6..787f0ffcfd4 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.h +++ b/cpp/src/Ice/ObjectAdapterFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OBJECT_ADAPTER_FACTORY_H +#define ICE_OBJECT_ADAPTER_FACTORY_H #include <Ice/ObjectAdapterI.h> #include <IceUtil/RecMutex.h> @@ -47,3 +48,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index 811ee056d27..db135a44199 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OBJECT_ADAPTER_I_H +#define ICE_OBJECT_ADAPTER_I_H #include <IceUtil/Shared.h> #include <IceUtil/RecMutex.h> @@ -143,3 +144,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h index 0c963b509eb..424610d5131 100644 --- a/cpp/src/Ice/ObjectFactoryManager.h +++ b/cpp/src/Ice/ObjectFactoryManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVANT_FACTORY_MANAGER_H +#define ICE_SERVANT_FACTORY_MANAGER_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -38,3 +39,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ObjectFactoryManagerF.h b/cpp/src/Ice/ObjectFactoryManagerF.h index 5befe55a0d0..9223e8290e8 100644 --- a/cpp/src/Ice/ObjectFactoryManagerF.h +++ b/cpp/src/Ice/ObjectFactoryManagerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVANT_FACTORY_MANAGER_F_H +#define ICE_SERVANT_FACTORY_MANAGER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(ObjectFactoryManager*); typedef Handle<ObjectFactoryManager> ObjectFactoryManagerPtr; } + +#endif diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h index d08f927af28..c9e3e05a20d 100644 --- a/cpp/src/Ice/OpaqueEndpointI.h +++ b/cpp/src/Ice/OpaqueEndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UNKNOWN_ENDPOINT_I_H +#define ICE_UNKNOWN_ENDPOINT_I_H #include <Ice/EndpointI.h> #include <Ice/EndpointFactory.h> @@ -59,3 +60,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h index a7b7578ebaa..b44d397c46d 100644 --- a/cpp/src/Ice/PluginManagerI.h +++ b/cpp/src/Ice/PluginManagerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PLUGIN_MANAGER_I_H +#define ICE_PLUGIN_MANAGER_I_H #include <Ice/Plugin.h> #include <Ice/InstanceF.h> @@ -66,3 +67,6 @@ private: typedef IceUtil::Handle<PluginManagerI> PluginManagerIPtr; } + + +#endif diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h index a54b042cff2..5e65f91f330 100644 --- a/cpp/src/Ice/PropertiesI.h +++ b/cpp/src/Ice/PropertiesI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROPERTIES_I_H +#define ICE_PROPERTIES_I_H #include <IceUtil/Mutex.h> #include <Ice/Properties.h> @@ -73,3 +74,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index b9e7b8cd97b..af3b5e2dafb 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Aug 30 14:36:00 2012 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 10 08:48:24 2012 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index ecb560f6943..400700cb2fd 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -8,11 +8,12 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Aug 30 14:36:00 2012 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 10 08:48:24 2012 // IMPORTANT: Do not edit this file -- any edits made here will be lost! -#pragma once +#ifndef ICE_INTERNAL_PropertyNames_H +#define ICE_INTERNAL_PropertyNames_H #include <Ice/Config.h> @@ -46,9 +47,9 @@ struct PropertyArray const Property* properties; const int length; - PropertyArray(const Property* p, int len) : + PropertyArray(const Property* p, size_t len) : properties(p), - length(len) + length(static_cast<int>(len)) { } }; @@ -76,3 +77,4 @@ public: } +#endif diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 4760984eb48..59081974ffa 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -1106,7 +1106,7 @@ IceProxy::Ice::Object::ice_getCachedConnection() const { Handle< ::IceDelegate::Ice::Object> __del; { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); __del = _delegate; } @@ -1194,7 +1194,7 @@ IceProxy::Ice::Object::__copyFrom(const ObjectPrx& from) Handle< ::IceDelegateM::Ice::Object> delegateM; { - IceUtil::Mutex::Lock sync(*from.get()); + IceUtil::Mutex::Lock sync(from->_mutex); ref = from->_reference; delegateD = dynamic_cast< ::IceDelegateD::Ice::Object*>(from->_delegate.get()); @@ -1245,7 +1245,7 @@ IceProxy::Ice::Object::__handleException(const ::IceInternal::Handle< ::IceDeleg // Only _delegate needs to be mutex protected here. // { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(delegate.get() == _delegate.get()) { _delegate = 0; @@ -1288,7 +1288,7 @@ IceProxy::Ice::Object::__handleExceptionWrapper(const ::IceInternal::Handle< ::I InvocationObserver& observer) { { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(delegate.get() == _delegate.get()) { _delegate = 0; @@ -1322,7 +1322,7 @@ IceProxy::Ice::Object::__handleExceptionWrapperRelaxed(const ::IceInternal::Hand else { { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(del.get() == _delegate.get()) { _delegate = 0; @@ -1394,7 +1394,7 @@ IceProxy::Ice::Object::__getDelegate(bool ami) { if(_reference->getCacheConnection()) { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(_delegate) { return _delegate; @@ -1415,7 +1415,7 @@ IceProxy::Ice::Object::__setRequestHandler(const Handle< ::IceDelegate::Ice::Obj { if(_reference->getCacheConnection()) { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(_delegate.get() == delegate.get()) { if(dynamic_cast< ::IceDelegateM::Ice::Object*>(_delegate.get())) diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h index 80dcd548bb7..0c94420816c 100644 --- a/cpp/src/Ice/ProxyFactory.h +++ b/cpp/src/Ice/ProxyFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROXY_FACTORY_H +#define ICE_PROXY_FACTORY_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -52,3 +53,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index 09737cde019..4fad67eab08 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REFERENCE_H +#define ICE_REFERENCE_H #include <IceUtil/Shared.h> #include <Ice/ReferenceF.h> @@ -297,3 +298,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h index cafd428f07e..dd1982f96de 100644 --- a/cpp/src/Ice/ReferenceFactory.h +++ b/cpp/src/Ice/ReferenceFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REFERENCE_FACTORY_H +#define ICE_REFERENCE_FACTORY_H #include <IceUtil/Shared.h> #include <Ice/ReferenceFactoryF.h> @@ -75,3 +76,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h index 4ed346064ca..52c8ea0a17c 100644 --- a/cpp/src/Ice/ReferenceFactoryF.h +++ b/cpp/src/Ice/ReferenceFactoryF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REFERENCE_FACTORY_F_H +#define ICE_REFERENCE_FACTORY_F_H #include <Ice/Handle.h> @@ -19,3 +20,5 @@ IceUtil::Shared* upCast(ReferenceFactory*); typedef Handle<ReferenceFactory> ReferenceFactoryPtr; } + +#endif diff --git a/cpp/src/Ice/ReplyStatus.h b/cpp/src/Ice/ReplyStatus.h index ff6929ca72a..0f3dccad897 100644 --- a/cpp/src/Ice/ReplyStatus.h +++ b/cpp/src/Ice/ReplyStatus.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REPLY_STATUS_H +#define ICE_REPLY_STATUS_H #include <Ice/Config.h> @@ -24,3 +25,5 @@ static const Ice::Byte replyUnknownUserException = 6; static const Ice::Byte replyUnknownException = 7; } + +#endif diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h index c6cfef95579..9990aa7fafd 100644 --- a/cpp/src/Ice/RequestHandler.h +++ b/cpp/src/Ice/RequestHandler.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REQUEST_HANDLER_H +#define ICE_REQUEST_HANDLER_H #include <IceUtil/Shared.h> @@ -52,3 +53,5 @@ protected: }; } + +#endif diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h index b0a875d1a32..fdfcaa1fe70 100644 --- a/cpp/src/Ice/RetryQueue.h +++ b/cpp/src/Ice/RetryQueue.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_RETRY_QUEUE_H +#define ICE_RETRY_QUEUE_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -56,3 +57,6 @@ private: }; } + +#endif + diff --git a/cpp/src/Ice/RetryQueueF.h b/cpp/src/Ice/RetryQueueF.h index ca39e18b7e5..2cdea2a6c53 100644 --- a/cpp/src/Ice/RetryQueueF.h +++ b/cpp/src/Ice/RetryQueueF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_RETRY_QUEUE_F_H +#define ICE_RETRY_QUEUE_F_H #include <Ice/Handle.h> @@ -19,3 +20,5 @@ IceUtil::Shared* upCast(RetryQueue*); typedef Handle<RetryQueue> RetryQueuePtr; } + +#endif diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h index b1c80ed07fb..b3508d7edba 100644 --- a/cpp/src/Ice/RouterInfo.h +++ b/cpp/src/Ice/RouterInfo.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ROUTER_INFO_H +#define ICE_ROUTER_INFO_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -135,3 +136,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h index e05324c01cf..ecdb4074873 100644 --- a/cpp/src/Ice/RouterInfoF.h +++ b/cpp/src/Ice/RouterInfoF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ROUTER_INFO_F_H +#define ICE_ROUTER_INFO_F_H #include <IceUtil/Shared.h> @@ -25,3 +26,5 @@ IceUtil::Shared* upCast(RouterInfo*); typedef Handle<RouterInfo> RouterInfoPtr; } + +#endif diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index 1bcaed5b087..d6921c5a54d 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -553,7 +553,9 @@ Selector::~Selector() void Selector::destroy() { +#if !defined(ICE_USE_SELECT) && !defined(ICE_USE_POLL) assert(_events.empty()); +#endif } void diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h index 06727cf1a56..7ffd724e0f0 100644 --- a/cpp/src/Ice/Selector.h +++ b/cpp/src/Ice/Selector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SELECTOR_H +#define ICE_SELECTOR_H #include <IceUtil/StringUtil.h> #include <IceUtil/Monitor.h> @@ -226,3 +227,5 @@ private: #endif } + +#endif diff --git a/cpp/src/Ice/ServantManager.h b/cpp/src/Ice/ServantManager.h index 3f2f63402e8..5ee56eb4e02 100644 --- a/cpp/src/Ice/ServantManager.h +++ b/cpp/src/Ice/ServantManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVANT_MANAGER_H +#define ICE_SERVANT_MANAGER_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -69,3 +70,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/SharedContext.h b/cpp/src/Ice/SharedContext.h index 8e906d8527e..48910f7270b 100644 --- a/cpp/src/Ice/SharedContext.h +++ b/cpp/src/Ice/SharedContext.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SHARED_CONTEXT_H +#define ICE_SHARED_CONTEXT_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -46,3 +47,5 @@ private: }; typedef IceUtil::Handle<SharedContext> SharedContextPtr; } + +#endif diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h index 0ccf35a8e6a..8d9bba4e977 100644 --- a/cpp/src/Ice/StreamI.h +++ b/cpp/src/Ice/StreamI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STREAM_I_H +#define ICE_STREAM_I_H #include <Ice/Stream.h> @@ -87,6 +88,10 @@ public: virtual void read(std::pair<const Float*, const Float*>&, ::IceUtil::ScopedArray<Float>&); virtual void read(std::pair<const Double*, const Double*>&, ::IceUtil::ScopedArray<Double>&); +#ifdef __SUNPRO_CC + using InputStream::read; +#endif + virtual bool readOptional(Int, OptionalType); virtual void closure(void*); @@ -138,6 +143,10 @@ public: virtual void write(const Float*, const Float*); virtual void write(const Double*, const Double*); +#ifdef __SUNPRO_CC + using OutputStream::write; +#endif + virtual void writeOptional(Int, OptionalType); virtual void startObject(const SlicedDataPtr&); @@ -172,3 +181,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h index 7675fb77fe7..5074f6af57f 100644 --- a/cpp/src/Ice/SysLoggerI.h +++ b/cpp/src/Ice/SysLoggerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SYS_LOGGER_I_H +#define ICE_SYS_LOGGER_I_H #include <IceUtil/Mutex.h> #include <Ice/Logger.h> @@ -36,3 +37,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h index 8f4a8f78cc6..c54ae4dbb27 100644 --- a/cpp/src/Ice/TcpAcceptor.h +++ b/cpp/src/Ice/TcpAcceptor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_ACCEPTOR_H +#define ICE_TCP_ACCEPTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -63,4 +64,5 @@ private: }; } +#endif diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h index 422c36083b0..341696087ef 100644 --- a/cpp/src/Ice/TcpConnector.h +++ b/cpp/src/Ice/TcpConnector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_CONNECTOR_H +#define ICE_TCP_CONNECTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -51,3 +52,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index 98cd4865112..49bd4329ef3 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_ENDPOINT_I_H +#define ICE_TCP_ENDPOINT_I_H #include <IceUtil/Config.h> #include <Ice/EndpointI.h> @@ -83,3 +84,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h index 01fd7ac3d11..82099820416 100644 --- a/cpp/src/Ice/TcpTransceiver.h +++ b/cpp/src/Ice/TcpTransceiver.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_TRANSCEIVER_H +#define ICE_TCP_TRANSCEIVER_H #include <Ice/InstanceF.h> #include <Ice/TraceLevelsF.h> @@ -80,3 +81,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index f3ae7c68283..fe80f9b129e 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_THREAD_POOL_H +#define ICE_THREAD_POOL_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -369,3 +370,6 @@ private: #endif }; + + +#endif diff --git a/cpp/src/Ice/ThreadPoolF.h b/cpp/src/Ice/ThreadPoolF.h index a658181cf6c..0c44f48db9a 100644 --- a/cpp/src/Ice/ThreadPoolF.h +++ b/cpp/src/Ice/ThreadPoolF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_THREAD_POOL_F_H +#define ICE_THREAD_POOL_F_H #include <IceUtil/Shared.h> @@ -27,3 +28,5 @@ typedef Handle<ThreadPoolWorkItem> ThreadPoolWorkItemPtr; class ThreadPoolCurrent; } + +#endif diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h index 34841ab0a9f..c562c3e4be4 100644 --- a/cpp/src/Ice/TraceLevels.h +++ b/cpp/src/Ice/TraceLevels.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRACE_LEVELS_H +#define ICE_TRACE_LEVELS_H #include <IceUtil/Shared.h> #include <Ice/TraceLevelsF.h> @@ -45,3 +46,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h index 42dc6fc5380..da3a12d0b98 100644 --- a/cpp/src/Ice/TraceLevelsF.h +++ b/cpp/src/Ice/TraceLevelsF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRACE_LEVELS_F_H +#define ICE_TRACE_LEVELS_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(TraceLevels*); typedef Handle<TraceLevels> TraceLevelsPtr; } + +#endif diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h index c0b787a4921..c45cb8b01a0 100644 --- a/cpp/src/Ice/TraceUtil.h +++ b/cpp/src/Ice/TraceUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRACE_UTIL_H +#define ICE_TRACE_UTIL_H #include <Ice/LoggerF.h> #include <Ice/TraceLevelsF.h> @@ -23,3 +24,5 @@ void trace(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const Trace void traceSlicing(const char*, const ::std::string&, const char *, const ::Ice::LoggerPtr&); } + +#endif diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h index 5c48034ab45..3cf9b9d867a 100644 --- a/cpp/src/Ice/Transceiver.h +++ b/cpp/src/Ice/Transceiver.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRANSCEIVER_H +#define ICE_TRANSCEIVER_H #include <IceUtil/Shared.h> #include <Ice/TransceiverF.h> @@ -41,3 +42,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h index 407540d0c9d..0c6eae51720 100644 --- a/cpp/src/Ice/TransceiverF.h +++ b/cpp/src/Ice/TransceiverF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRANSCEIVER_F_H +#define ICE_TRANSCEIVER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(Transceiver*); typedef Handle<Transceiver> TransceiverPtr; } + +#endif diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h index 92011e4a9a5..148c767407b 100644 --- a/cpp/src/Ice/UdpConnector.h +++ b/cpp/src/Ice/UdpConnector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UDP_CONNECTOR_H +#define ICE_UDP_CONNECTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -49,3 +50,4 @@ private: }; } +#endif diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index e6f6208e603..9bfe598f9ad 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UDP_ENDPOINT_I_H +#define ICE_UDP_ENDPOINT_I_H #include <IceUtil/Config.h> #include <Ice/EndpointI.h> @@ -85,3 +86,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index 9ecfaa1fceb..581f7527960 100644 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -177,11 +177,11 @@ repeat: socklen_t len = static_cast<socklen_t>(sizeof(_peerAddr)); if(_peerAddr.ss_family == AF_INET) { - len = sizeof(sockaddr_in); + len = static_cast<socklen_t>(sizeof(sockaddr_in)); } else if(_peerAddr.ss_family == AF_INET6) { - len = sizeof(sockaddr_in6); + len = static_cast<socklen_t>(sizeof(sockaddr_in6)); } else { diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h index a189f5263f9..0a1fc7155ba 100644 --- a/cpp/src/Ice/UdpTransceiver.h +++ b/cpp/src/Ice/UdpTransceiver.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UDP_TRANSCEIVER_H +#define ICE_UDP_TRANSCEIVER_H #include <Ice/InstanceF.h> #include <Ice/TraceLevelsF.h> @@ -116,4 +117,4 @@ private: }; } - +#endif diff --git a/cpp/src/Ice/winrt/StreamAcceptor.h b/cpp/src/Ice/winrt/StreamAcceptor.h index f18d5f3439e..d5f84422442 100644 --- a/cpp/src/Ice/winrt/StreamAcceptor.h +++ b/cpp/src/Ice/winrt/StreamAcceptor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STREAM_ACCEPTOR_H +#define ICE_STREAM_ACCEPTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -64,3 +65,5 @@ private: }; } +#endif + diff --git a/cpp/src/Ice/winrt/StreamConnector.h b/cpp/src/Ice/winrt/StreamConnector.h index 6a316792c06..ab156177e55 100644 --- a/cpp/src/Ice/winrt/StreamConnector.h +++ b/cpp/src/Ice/winrt/StreamConnector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_CONNECTOR_H +#define ICE_TCP_CONNECTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -51,3 +52,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/winrt/StreamEndpointI.h b/cpp/src/Ice/winrt/StreamEndpointI.h index cd7a4cc6549..6d102ff3647 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.h +++ b/cpp/src/Ice/winrt/StreamEndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_ENDPOINT_I_H +#define ICE_TCP_ENDPOINT_I_H #include <IceUtil/Config.h> #include <Ice/EndpointI.h> @@ -85,3 +86,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/winrt/StreamTransceiver.h b/cpp/src/Ice/winrt/StreamTransceiver.h index ffab6874589..11d27eee6ff 100644 --- a/cpp/src/Ice/winrt/StreamTransceiver.h +++ b/cpp/src/Ice/winrt/StreamTransceiver.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STREAM_TRANSCEIVER_H +#define ICE_STREAM_TRANSCEIVER_H #include <Ice/InstanceF.h> #include <Ice/TraceLevelsF.h> @@ -88,3 +89,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h index a2b5388f4a8..2adf9c40583 100644 --- a/cpp/src/IceBox/ServiceManagerI.h +++ b/cpp/src/IceBox/ServiceManagerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SERVICE_MANAGER_I_H +#define SERVICE_MANAGER_I_H #include <IceBox/IceBox.h> #include <Ice/LoggerF.h> @@ -87,3 +88,5 @@ private: typedef IceUtil::Handle<ServiceManagerI> ServiceManagerIPtr; } + +#endif diff --git a/cpp/src/IceDB/FreezeTypes.h b/cpp/src/IceDB/FreezeTypes.h index d10645b7197..835e308fee3 100644 --- a/cpp/src/IceDB/FreezeTypes.h +++ b/cpp/src/IceDB/FreezeTypes.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_TYPES_H +#define FREEZE_TYPES_H #include <IceDB/IceDB.h> #include <Freeze/Freeze.h> @@ -193,3 +194,6 @@ protected: }; } + +#endif + diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h index 53053b326de..fbf4c9ebbcb 100644 --- a/cpp/src/IceDB/IceDB.h +++ b/cpp/src/IceDB/IceDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DB_H +#define ICE_DB_H #include <IceUtil/Exception.h> #include <IceUtil/Shared.h> @@ -109,3 +110,5 @@ public: }; } + +#endif diff --git a/cpp/src/IceDB/SqlTypes.h b/cpp/src/IceDB/SqlTypes.h index ad310c755f9..b908c13df98 100644 --- a/cpp/src/IceDB/SqlTypes.h +++ b/cpp/src/IceDB/SqlTypes.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_TYPES_H +#define SQL_TYPES_H #include <IceDB/IceDB.h> @@ -205,3 +206,5 @@ protected: }; } + +#endif diff --git a/cpp/src/IceGrid/Activator.h b/cpp/src/IceGrid/Activator.h index 3e0ecc14c6e..99af1b1fa84 100644 --- a/cpp/src/IceGrid/Activator.h +++ b/cpp/src/IceGrid/Activator.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ACTIVATOR_H +#define ICE_GRID_ACTIVATOR_H #include <IceUtil/Thread.h> #include <IceGrid/Internal.h> @@ -94,3 +95,5 @@ private: typedef IceUtil::Handle<Activator> ActivatorPtr; } + +#endif diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h index 9a466b37933..9a42d62b645 100644 --- a/cpp/src/IceGrid/AdapterCache.h +++ b/cpp/src/IceGrid/AdapterCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ADAPTERCACHE_H +#define ICE_GRID_ADAPTERCACHE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -145,3 +146,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/AdminCallbackRouter.h b/cpp/src/IceGrid/AdminCallbackRouter.h index 8ae022f5759..cdeb6b01adf 100644 --- a/cpp/src/IceGrid/AdminCallbackRouter.h +++ b/cpp/src/IceGrid/AdminCallbackRouter.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ADMIN_CALLBACK_ROUTER_H +#define ICE_GRID_ADMIN_CALLBACK_ROUTER_H #include <Ice/Ice.h> #include <IceUtil/IceUtil.h> @@ -65,3 +66,4 @@ private: typedef IceUtil::Handle<AdminCallbackRouter> AdminCallbackRouterPtr; } +#endif diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index 624f143c1ba..b78f13483df 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -830,12 +830,14 @@ AdminI::getNodeProcessorSocketCount(const string& name, const Current&) const catch(const Ice::ObjectNotExistException&) { throw NodeNotExistException(name); + return 0; } catch(const Ice::LocalException& ex) { ostringstream os; os << ex; throw NodeUnreachableException(name, os.str()); + return 0; } } diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h index 864170dec19..f7e144803b0 100644 --- a/cpp/src/IceGrid/AdminI.h +++ b/cpp/src/IceGrid/AdminI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ADMIN_I_H +#define ICE_GRID_ADMIN_I_H #include <IceGrid/Admin.h> @@ -103,3 +104,5 @@ private: typedef IceUtil::Handle<AdminI> AdminIPtr; } + +#endif diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp index 501af30ab80..25aeaffe85a 100644 --- a/cpp/src/IceGrid/AdminSessionI.cpp +++ b/cpp/src/IceGrid/AdminSessionI.cpp @@ -238,6 +238,7 @@ AdminSessionI::openServerLog(const string& id, const string& path, int nLines, c catch(const SynchronizationException&) { throw DeploymentException("server is being updated"); + return 0; } } @@ -251,6 +252,7 @@ AdminSessionI::openServerStdOut(const string& id, int nLines, const Ice::Current catch(const SynchronizationException&) { throw DeploymentException("server is being updated"); + return 0; } } @@ -264,6 +266,7 @@ AdminSessionI::openServerStdErr(const string& id, int nLines, const Ice::Current catch(const SynchronizationException&) { throw DeploymentException("server is being updated"); + return 0; } } diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h index 65a699fa3fd..ff234953ab3 100644 --- a/cpp/src/IceGrid/AdminSessionI.h +++ b/cpp/src/IceGrid/AdminSessionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_ADMINSESSIONI_H +#define ICEGRID_ADMINSESSIONI_H #include <IceGrid/SessionI.h> #include <IceGrid/Topics.h> @@ -146,3 +147,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h index 12f1bd25f91..bcbc018053e 100644 --- a/cpp/src/IceGrid/Allocatable.h +++ b/cpp/src/IceGrid/Allocatable.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ALLOCATABLE_H +#define ICE_GRID_ALLOCATABLE_H #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -112,3 +113,5 @@ protected: }; }; + +#endif diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h index a00c1dd24c6..ef304e712ea 100644 --- a/cpp/src/IceGrid/AllocatableObjectCache.h +++ b/cpp/src/IceGrid/AllocatableObjectCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ALLOCATABLEOBJECTCACHE_H +#define ICE_GRID_ALLOCATABLEOBJECTCACHE_H #include <IceUtil/Mutex.h> #include <Ice/CommunicatorF.h> @@ -113,3 +114,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h index e1bf02705e3..6e85ed1044c 100644 --- a/cpp/src/IceGrid/Cache.h +++ b/cpp/src/IceGrid/Cache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_CACHE_H +#define ICE_GRID_CACHE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -154,3 +155,5 @@ public: }; }; + +#endif diff --git a/cpp/src/IceGrid/DB.h b/cpp/src/IceGrid/DB.h index 2fa0daf11b6..29184783f3a 100644 --- a/cpp/src/IceGrid/DB.h +++ b/cpp/src/IceGrid/DB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef DATABASE_CACHE_H +#define DATABASE_CACHE_H #include <Ice/Plugin.h> #include <IceDB/IceDB.h> @@ -57,3 +58,6 @@ public: typedef IceUtil::Handle<DatabasePlugin> DatabasePluginPtr; } + + +#endif diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h index a3a8acd5656..c2eb5dc7c5f 100644 --- a/cpp/src/IceGrid/Database.h +++ b/cpp/src/IceGrid/Database.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_DATABASE_H +#define ICE_GRID_DATABASE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -238,3 +239,5 @@ private: typedef IceUtil::Handle<Database> DatabasePtr; }; + +#endif diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h index 3ce9b7ab64b..5a0358cb936 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.h +++ b/cpp/src/IceGrid/DescriptorBuilder.h @@ -7,13 +7,21 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_DESCRIPTOR_BUILDER_H +#define ICE_GRID_DESCRIPTOR_BUILDER_H #include <Ice/Logger.h> #include <IceXML/Parser.h> #include <IceGrid/Descriptor.h> #include <set> +#ifdef __SUNPRO_CC +// +// We hide some init functions on purpose in classes below +// +# pragma error_messages(off,hidef) +#endif + namespace IceGrid { @@ -309,4 +317,10 @@ private: ServiceDescriptorPtr _descriptor; }; -}; +} + +#ifdef __SUNPRO_CC +# pragma error_messages(default,hidef) +#endif + +#endif diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index ce9a74810e6..a9388ef7a8e 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -18,6 +18,13 @@ using namespace IceUtil; using namespace IceUtilInternal; using namespace IceGrid; +#ifdef __SUNPRO_CC +// +// Disable warning about unassigned function objects +// +# pragma error_messages(off,unassigned) +#endif + namespace IceGrid { diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h index eeda3eee3a1..41eca184ecf 100644 --- a/cpp/src/IceGrid/DescriptorHelper.h +++ b/cpp/src/IceGrid/DescriptorHelper.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_DESCRIPTOR_HELPER_H +#define ICE_GRID_DESCRIPTOR_HELPER_H #include <IceUtil/OutputUtil.h> #include <IceXML/Parser.h> @@ -225,7 +226,7 @@ public: protected: -#if defined(__sun) +#ifdef __SUNPRO_CC using ServerHelper::instantiateImpl; #endif @@ -345,3 +346,5 @@ ServerHelperPtr createHelper(const ServerDescriptorPtr&); bool isServerUpdated(const ServerInfo&, const ServerInfo&, bool = false); } + +#endif diff --git a/cpp/src/IceGrid/DescriptorParser.h b/cpp/src/IceGrid/DescriptorParser.h index 3404a87f7cb..ed808d01ad3 100644 --- a/cpp/src/IceGrid/DescriptorParser.h +++ b/cpp/src/IceGrid/DescriptorParser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_DESCRIPTOR_PARSER_H +#define ICEGRID_DESCRIPTOR_PARSER_H namespace IceGrid { @@ -27,3 +28,5 @@ public: }; } + +#endif diff --git a/cpp/src/IceGrid/FileCache.h b/cpp/src/IceGrid/FileCache.h index 70de97d1d09..eeded1132a2 100644 --- a/cpp/src/IceGrid/FileCache.h +++ b/cpp/src/IceGrid/FileCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_FILE_CACHE_H +#define ICE_GRID_FILE_CACHE_H #include <IceUtil/Shared.h> #include <Ice/BuiltinSequences.h> @@ -32,3 +33,5 @@ private: typedef IceUtil::Handle<FileCache> FileCachePtr; }; + +#endif diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h index 11c2b63f407..811236ed729 100644 --- a/cpp/src/IceGrid/FileParserI.h +++ b/cpp/src/IceGrid/FileParserI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_FILE_PARSERI_H +#define ICE_GRID_FILE_PARSERI_H #include <IceGrid/FileParser.h> @@ -18,3 +19,5 @@ public: IceGrid::ApplicationDescriptor parse(const std::string& file, const IceGrid::AdminPrx& admin, const Ice::Current&); }; + +#endif diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.h b/cpp/src/IceGrid/FileUserAccountMapperI.h index 4112621bd88..f2e978ab102 100644 --- a/cpp/src/IceGrid/FileUserAccountMapperI.h +++ b/cpp/src/IceGrid/FileUserAccountMapperI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_FILEUSERACCOUNTMAPPERI_H +#define ICE_GRID_FILEUSERACCOUNTMAPPERI_H #include <IceGrid/UserAccountMapper.h> @@ -28,3 +29,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/FreezeDB/FreezeDB.h b/cpp/src/IceGrid/FreezeDB/FreezeDB.h index 6604c5ece55..a730cb83091 100644 --- a/cpp/src/IceGrid/FreezeDB/FreezeDB.h +++ b/cpp/src/IceGrid/FreezeDB/FreezeDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_DATABASE_CACHE_H +#define FREEZE_DATABASE_CACHE_H #include <IceDB/FreezeTypes.h> @@ -47,3 +48,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/InternalRegistryI.h b/cpp/src/IceGrid/InternalRegistryI.h index 42400f346b3..613bbef367c 100644 --- a/cpp/src/IceGrid/InternalRegistryI.h +++ b/cpp/src/IceGrid/InternalRegistryI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_INTERNALREGISTRYI_H +#define ICE_GRID_INTERNALREGISTRYI_H #include <IceGrid/Registry.h> #include <IceGrid/Internal.h> @@ -72,3 +73,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h index 1ea9447380e..6e5fb87618b 100644 --- a/cpp/src/IceGrid/LocatorI.h +++ b/cpp/src/IceGrid/LocatorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_LOCATOR_I_H +#define ICE_GRID_LOCATOR_I_H #include <IceGrid/Internal.h> #include <IceGrid/Locator.h> @@ -79,3 +80,5 @@ protected: }; } + +#endif diff --git a/cpp/src/IceGrid/LocatorRegistryI.h b/cpp/src/IceGrid/LocatorRegistryI.h index b20ad40ccbc..91b4e110af0 100644 --- a/cpp/src/IceGrid/LocatorRegistryI.h +++ b/cpp/src/IceGrid/LocatorRegistryI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_LOCATOR_REGISTRY_I_H +#define ICE_GRID_LOCATOR_REGISTRY_I_H #include <IceGrid/Internal.h> #include <Ice/Locator.h> @@ -64,3 +65,5 @@ private: typedef IceUtil::Handle<LocatorRegistryI> LocatorRegistryIPtr; } + +#endif diff --git a/cpp/src/IceGrid/NodeCache.h b/cpp/src/IceGrid/NodeCache.h index af87fe2730b..f3f28068157 100644 --- a/cpp/src/IceGrid/NodeCache.h +++ b/cpp/src/IceGrid/NodeCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_NODECACHE_H +#define ICE_GRID_NODECACHE_H #include <IceUtil/RecMutex.h> #include <IceUtil/Shared.h> @@ -105,3 +106,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h index 39d39a976b8..64e3803295a 100644 --- a/cpp/src/IceGrid/NodeI.h +++ b/cpp/src/IceGrid/NodeI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_NODE_I_H +#define ICE_GRID_NODE_I_H #include <IceUtil/Timer.h> #include <IcePatch2/FileServer.h> @@ -188,3 +189,5 @@ private: typedef IceUtil::Handle<NodeI> NodeIPtr; } + +#endif diff --git a/cpp/src/IceGrid/NodeServerAdminRouter.h b/cpp/src/IceGrid/NodeServerAdminRouter.h index 744e13af22d..c649a874152 100644 --- a/cpp/src/IceGrid/NodeServerAdminRouter.h +++ b/cpp/src/IceGrid/NodeServerAdminRouter.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_NODE_SERVER_ADMIN_ROUTER_H +#define ICE_GRID_NODE_SERVER_ADMIN_ROUTER_H #include <IceGrid/NodeI.h> @@ -28,3 +29,4 @@ private: NodeIPtr _node; }; } +#endif diff --git a/cpp/src/IceGrid/NodeSessionI.h b/cpp/src/IceGrid/NodeSessionI.h index 55c18fc8e81..4e813f26332 100644 --- a/cpp/src/IceGrid/NodeSessionI.h +++ b/cpp/src/IceGrid/NodeSessionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_NODE_SESSION_H +#define ICEGRID_NODE_SESSION_H #include <IceGrid/Internal.h> #include <set> @@ -100,3 +101,5 @@ private: typedef IceUtil::Handle<NodeSessionI> NodeSessionIPtr; }; + +#endif diff --git a/cpp/src/IceGrid/NodeSessionManager.h b/cpp/src/IceGrid/NodeSessionManager.h index 2d8c4694345..71bd1d032ea 100644 --- a/cpp/src/IceGrid/NodeSessionManager.h +++ b/cpp/src/IceGrid/NodeSessionManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_NODE_SESSION_MANAGER_H +#define ICE_GRID_NODE_SESSION_MANAGER_H #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -136,3 +137,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h index c1e77dd5e9c..523b90f231e 100644 --- a/cpp/src/IceGrid/ObjectCache.h +++ b/cpp/src/IceGrid/ObjectCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_OBJECTCACHE_H +#define ICE_GRID_OBJECTCACHE_H #include <IceUtil/Mutex.h> #include <Ice/CommunicatorF.h> @@ -80,3 +81,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h index fb5491a2c36..f53b3a94002 100644 --- a/cpp/src/IceGrid/Parser.h +++ b/cpp/src/IceGrid/Parser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_PARSER_H +#define ICE_GRID_PARSER_H #include <IceUtil/Handle.h> #include <IceGrid/Admin.h> @@ -164,3 +165,5 @@ private: extern Parser* parser; // The current parser for bison/flex } + +#endif diff --git a/cpp/src/IceGrid/PlatformInfo.h b/cpp/src/IceGrid/PlatformInfo.h index 1eece75e606..1afc7bdb932 100644 --- a/cpp/src/IceGrid/PlatformInfo.h +++ b/cpp/src/IceGrid/PlatformInfo.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_PLATFORM_INFO_H +#define ICE_GRID_PLATFORM_INFO_H #include <IceUtil/Thread.h> #include <IceGrid/Internal.h> @@ -87,3 +88,5 @@ private: }; + +#endif diff --git a/cpp/src/IceGrid/QueryI.h b/cpp/src/IceGrid/QueryI.h index b1b8baa26c0..b64e5cceaac 100644 --- a/cpp/src/IceGrid/QueryI.h +++ b/cpp/src/IceGrid/QueryI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_QUERY_I_H +#define ICE_GRID_QUERY_I_H #include <IceGrid/Query.h> #include <Ice/CommunicatorF.h> @@ -43,3 +44,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h index 2e7906cb6af..9d4322dd3d6 100644 --- a/cpp/src/IceGrid/ReapThread.h +++ b/cpp/src/IceGrid/ReapThread.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_REAPER_THREAD_H +#define ICEGRID_REAPER_THREAD_H #include <IceUtil/Thread.h> #include <IceUtil/Mutex.h> @@ -112,3 +113,5 @@ private: typedef IceUtil::Handle<ReapThread> ReapThreadPtr; }; + +#endif diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index aa9c7fcb68c..a17dbb729f9 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_REGISTRYI_H +#define ICE_GRID_REGISTRYI_H #include <IceUtil/Timer.h> #include <IceGrid/Registry.h> @@ -132,3 +133,5 @@ private: typedef IceUtil::Handle<RegistryI> RegistryIPtr; } + +#endif diff --git a/cpp/src/IceGrid/RegistryServerAdminRouter.h b/cpp/src/IceGrid/RegistryServerAdminRouter.h index e8bb41b7c91..15ed8161626 100644 --- a/cpp/src/IceGrid/RegistryServerAdminRouter.h +++ b/cpp/src/IceGrid/RegistryServerAdminRouter.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_REGISTRY_SERVER_ADMIN_ROUTER_H +#define ICE_GRID_REGISTRY_SERVER_ADMIN_ROUTER_H #include <IceGrid/Database.h> @@ -30,3 +31,4 @@ private: }; } +#endif diff --git a/cpp/src/IceGrid/ReplicaCache.h b/cpp/src/IceGrid/ReplicaCache.h index 2eaa7c38229..76c9fa5481e 100644 --- a/cpp/src/IceGrid/ReplicaCache.h +++ b/cpp/src/IceGrid/ReplicaCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_REPLICACACHE_H +#define ICE_GRID_REPLICACACHE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -73,3 +74,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/ReplicaSessionI.h b/cpp/src/IceGrid/ReplicaSessionI.h index 27dfd08ee68..9ca0ead61ac 100644 --- a/cpp/src/IceGrid/ReplicaSessionI.h +++ b/cpp/src/IceGrid/ReplicaSessionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_REPLICA_SESSION_H +#define ICEGRID_REPLICA_SESSION_H #include <IceGrid/Registry.h> #include <IceGrid/Internal.h> @@ -71,3 +72,5 @@ private: typedef IceUtil::Handle<ReplicaSessionI> ReplicaSessionIPtr; }; + +#endif diff --git a/cpp/src/IceGrid/ReplicaSessionManager.h b/cpp/src/IceGrid/ReplicaSessionManager.h index 28f626a45a0..84d9da6aa61 100644 --- a/cpp/src/IceGrid/ReplicaSessionManager.h +++ b/cpp/src/IceGrid/ReplicaSessionManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_REPLICA_SESSION_MANAGER_H +#define ICE_GRID_REPLICA_SESSION_MANAGER_H #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -108,3 +109,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/Scanner.cpp b/cpp/src/IceGrid/Scanner.cpp index 7a5103303c3..9716be00a08 100644 --- a/cpp/src/IceGrid/Scanner.cpp +++ b/cpp/src/IceGrid/Scanner.cpp @@ -54,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -507,6 +498,16 @@ using namespace IceGrid; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) namespace IceGrid @@ -522,7 +523,7 @@ std::string parseSingleQuotedString(); } #define YY_USER_INIT initScanner(); -#line 525 "lex.yy.c" +#line 526 "lex.yy.c" #define INITIAL 0 @@ -603,12 +604,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -616,7 +612,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -627,7 +623,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -709,10 +705,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 65 "Scanner.l" +#line 75 "Scanner.l" -#line 715 "lex.yy.c" +#line 711 "lex.yy.c" if ( !(yy_init) ) { @@ -797,7 +793,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 67 "Scanner.l" +#line 77 "Scanner.l" { // C++-style comment int c; @@ -810,7 +806,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 77 "Scanner.l" +#line 87 "Scanner.l" { // C-style comment while(true) @@ -839,7 +835,7 @@ YY_RULE_SETUP case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 102 "Scanner.l" +#line 112 "Scanner.l" { size_t len = strlen(yytext); for(size_t i = 0; i < len; ++i) @@ -854,14 +850,14 @@ YY_RULE_SETUP case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 113 "Scanner.l" +#line 123 "Scanner.l" { return ';'; } YY_BREAK case 5: YY_RULE_SETUP -#line 117 "Scanner.l" +#line 127 "Scanner.l" { // "..."-type strings string s = parseDoubleQuotedString(); @@ -872,7 +868,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 125 "Scanner.l" +#line 135 "Scanner.l" { // '...'-type strings string s; @@ -900,7 +896,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 150 "Scanner.l" +#line 160 "Scanner.l" { // Simple strings string s; @@ -939,10 +935,10 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 186 "Scanner.l" +#line 196 "Scanner.l" ECHO; YY_BREAK -#line 945 "lex.yy.c" +#line 941 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1696,8 +1692,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -1936,7 +1932,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 186 "Scanner.l" +#line 196 "Scanner.l" diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l index 200b4f7598d..924d074c9fc 100644 --- a/cpp/src/IceGrid/Scanner.l +++ b/cpp/src/IceGrid/Scanner.l @@ -38,6 +38,16 @@ using namespace IceGrid; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) namespace IceGrid diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h index c2ad30f8c9b..db4ce4cc3fb 100644 --- a/cpp/src/IceGrid/ServerAdapterI.h +++ b/cpp/src/IceGrid/ServerAdapterI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SERVER_ADAPTER_I_H +#define ICE_GRID_SERVER_ADAPTER_I_H #include <IceUtil/Mutex.h> #include <IceGrid/Internal.h> @@ -55,3 +56,5 @@ private: typedef IceUtil::Handle<ServerAdapterI> ServerAdapterIPtr; } + +#endif diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h index 866ba3652aa..fa46ff5c97e 100644 --- a/cpp/src/IceGrid/ServerCache.h +++ b/cpp/src/IceGrid/ServerCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SERVERCACHE_H +#define ICE_GRID_SERVERCACHE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -167,3 +168,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h index b86d611bf7a..423b222a9ef 100644 --- a/cpp/src/IceGrid/ServerI.h +++ b/cpp/src/IceGrid/ServerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SERVER_I_H +#define ICE_GRID_SERVER_I_H #include <IceUtil/Mutex.h> #include <IceUtil/Timer.h> @@ -334,3 +335,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h index b1660792e13..e7ca6f3b863 100644 --- a/cpp/src/IceGrid/SessionI.h +++ b/cpp/src/IceGrid/SessionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_SESSIONI_H +#define ICEGRID_SESSIONI_H #include <IceUtil/Mutex.h> #include <IceUtil/Timer.h> @@ -156,3 +157,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h index 756c564cea5..e23ed3aee6a 100644 --- a/cpp/src/IceGrid/SessionManager.h +++ b/cpp/src/IceGrid/SessionManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SESSION_MANAGER_H +#define ICE_GRID_SESSION_MANAGER_H #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -313,3 +314,5 @@ protected: }; }; + +#endif diff --git a/cpp/src/IceGrid/SessionServantManager.h b/cpp/src/IceGrid/SessionServantManager.h index 411b9bde459..76dfd1f801a 100644 --- a/cpp/src/IceGrid/SessionServantManager.h +++ b/cpp/src/IceGrid/SessionServantManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SESSIONSERVANTLOCATOR_H +#define ICE_GRID_SESSIONSERVANTLOCATOR_H #include <IceGrid/AdminCallbackRouter.h> #include <IceUtil/Mutex.h> @@ -83,3 +84,5 @@ private: typedef IceUtil::Handle<SessionServantManager> SessionServantManagerPtr; }; + +#endif diff --git a/cpp/src/IceGrid/SqlDB/SqlDB.h b/cpp/src/IceGrid/SqlDB/SqlDB.h index 9f3f3d11767..fe518e2a790 100644 --- a/cpp/src/IceGrid/SqlDB/SqlDB.h +++ b/cpp/src/IceGrid/SqlDB/SqlDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_DATABASE_CACHE_H +#define SQL_DATABASE_CACHE_H #include <IceGrid/DB.h> @@ -63,3 +64,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h b/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h index dbe90d6509a..effb29dff56 100644 --- a/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h +++ b/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_IDENTITY_OBJECT_INFO_DICT_H +#define SQL_IDENTITY_OBJECT_INFO_DICT_H #include <Ice/CommunicatorF.h> #include <IceGrid/Admin.h> @@ -42,3 +43,5 @@ private: typedef IceUtil::Handle<SqlIdentityObjectInfoDict> SqlIdentityObjectInfoDictPtr; } + +#endif diff --git a/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h b/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h index e30395789b9..ab846be3d1f 100644 --- a/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h +++ b/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_STRING_ADAPTER_INFO_DICT_H +#define SQL_STRING_ADAPTER_INFO_DICT_H #include <Ice/CommunicatorF.h> #include <IceGrid/Admin.h> @@ -42,3 +43,5 @@ private: typedef IceUtil::Handle<SqlStringAdapterInfoDict> SqlStringAdapterInfoDictPtr; } + +#endif diff --git a/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h b/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h index f7452ab9ec0..c92d3eb807a 100644 --- a/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h +++ b/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_STRING_APPLICATION_INFO_DICT_H +#define SQL_STRING_APPLICATION_INFO_DICT_H #include <Ice/CommunicatorF.h> #include <IceGrid/Admin.h> @@ -41,3 +42,5 @@ private: typedef IceUtil::Handle<SqlStringApplicationInfoDict> SqlStringApplicationInfoDictPtr; } + +#endif diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h index 2ee85df44bb..7399457d35e 100644 --- a/cpp/src/IceGrid/Topics.h +++ b/cpp/src/IceGrid/Topics.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_TOPICS_H +#define ICEGRID_TOPICS_H #include <IceUtil/Mutex.h> #include <IceStorm/IceStorm.h> @@ -160,3 +161,5 @@ private: typedef IceUtil::Handle<ObjectObserverTopic> ObjectObserverTopicPtr; }; + +#endif diff --git a/cpp/src/IceGrid/TraceLevels.h b/cpp/src/IceGrid/TraceLevels.h index 127f378fcec..a3f687b0ebf 100644 --- a/cpp/src/IceGrid/TraceLevels.h +++ b/cpp/src/IceGrid/TraceLevels.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_TRACE_LEVELS_H +#define ICE_GRID_TRACE_LEVELS_H #include <IceUtil/Shared.h> #include <Ice/CommunicatorF.h> @@ -59,3 +60,5 @@ public: typedef IceUtil::Handle<TraceLevels> TraceLevelsPtr; } // End namespace IceGrid + +#endif diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h index c15ec35e0c3..9ba84619693 100755 --- a/cpp/src/IceGrid/Util.h +++ b/cpp/src/IceGrid/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_UTIL_H +#define ICE_GRID_UTIL_H #include <IceGrid/Descriptor.h> #include <IceUtil/StringUtil.h> @@ -117,3 +118,5 @@ inline getMatchingKeys(const T& m, const std::string& expression) } }; + +#endif diff --git a/cpp/src/IceGrid/WaitQueue.h b/cpp/src/IceGrid/WaitQueue.h index 83345b2f171..09691c9c04b 100644 --- a/cpp/src/IceGrid/WaitQueue.h +++ b/cpp/src/IceGrid/WaitQueue.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_WAIT_QUEUE_H +#define ICE_GRID_WAIT_QUEUE_H #include <IceUtil/Thread.h> #include <IceUtil/Monitor.h> @@ -57,3 +58,5 @@ private: typedef IceUtil::Handle<WaitQueue> WaitQueuePtr; } + +#endif diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.h b/cpp/src/IceGrid/WellKnownObjectsManager.h index fd1661150fc..5ef741840b4 100644 --- a/cpp/src/IceGrid/WellKnownObjectsManager.h +++ b/cpp/src/IceGrid/WellKnownObjectsManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H +#define ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H #include <IceGrid/Internal.h> @@ -46,3 +47,5 @@ private: typedef IceUtil::Handle<WellKnownObjectsManager> WellKnownObjectsManagerPtr; }; + +#endif diff --git a/cpp/src/IcePatch2/FileServerI.h b/cpp/src/IcePatch2/FileServerI.h index ba9190b2b88..5f32dcddafd 100644 --- a/cpp/src/IcePatch2/FileServerI.h +++ b/cpp/src/IcePatch2/FileServerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PATCH2_FILE_SERVER_I_H +#define ICE_PATCH2_FILE_SERVER_I_H #include <IcePatch2/Util.h> #include <IcePatch2/FileServer.h> @@ -37,3 +38,5 @@ private: }; } + +#endif diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index 7540d21864f..21ee03196ba 100755 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -37,78 +37,6 @@ const char* IcePatch2::checksumFile = "IcePatch2.sum"; const char* IcePatch2::logFile = "IcePatch2.log"; -// -// Solaris 9 and before doesn't have scandir() or alphasort(). -// -#ifdef __sun - -extern "C" int -ice_scandir(const char* dir, struct dirent*** namelist, - int (*select)(const struct dirent*), - int (*compar)(const void*, const void*)) -{ - DIR* d; - struct dirent* entry; - register int i = 0; - size_t entrysize; - - if((d = opendir(dir)) == 0) - { - return -1; - } - - *namelist = 0; - while((entry = readdir(d)) != 0) - { - if(select == 0 || (select != 0 && (*select)(entry))) - { - *namelist = (struct dirent**)realloc((void*)(*namelist), (size_t)((i + 1) * sizeof(struct dirent*))); - if(*namelist == 0) - { - closedir(d); - return -1; - } - - entrysize = sizeof(struct dirent) - sizeof(entry->d_name) + strlen(entry->d_name) + 1; - (*namelist)[i] = (struct dirent*)malloc(entrysize); - if((*namelist)[i] == 0) - { - closedir(d); - return -1; - } - memcpy((*namelist)[i], entry, entrysize); - ++i; - } - } - - if(closedir(d)) - { - return -1; - } - - if(i == 0) - { - return -1; - } - - if(compar != 0) - { - qsort((void *)(*namelist), (size_t)i, sizeof(struct dirent *), compar); - } - - return i; -} - -extern "C" int -ice_alphasort(const void* v1, const void* v2) -{ - const struct dirent **a = (const struct dirent **)v1; - const struct dirent **b = (const struct dirent **)v2; - return(strcmp((*a)->d_name, (*b)->d_name)); -} - -#endif - using namespace std; using namespace Ice; using namespace IcePatch2; @@ -530,11 +458,8 @@ IcePatch2::readDirectory(const string& pa) #else struct dirent **namelist; -#ifdef __sun - int n = ice_scandir(path.c_str(), &namelist, 0, ice_alphasort); -#else int n = scandir(path.c_str(), &namelist, 0, alphasort); -#endif + if(n < 0) { throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString(); diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h index 44daa2f261f..7a4fab4df00 100644 --- a/cpp/src/IceSSL/AcceptorI.h +++ b/cpp/src/IceSSL/AcceptorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_ACCEPTOR_I_H +#define ICE_SSL_ACCEPTOR_I_H #include <Ice/LoggerF.h> #include <Ice/TransceiverF.h> @@ -66,3 +67,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp index da9e7e2c4b9..7479263eb33 100644 --- a/cpp/src/IceSSL/Certificate.cpp +++ b/cpp/src/IceSSL/Certificate.cpp @@ -18,6 +18,22 @@ #include <openssl/x509v3.h> #include <openssl/pem.h> +#ifdef __SUNPRO_CC + +// +// The call to sk_GENERAL_NAME_pop_free fails to compile if we don't +// remove the extern "C" vs non extern "C" check with the macro below: +// + +extern "C" typedef void (*FreeFunc)(void*); + +#undef CHECKED_SK_FREE_FUNC +#define CHECKED_SK_FREE_FUNC(type, p) \ + (FreeFunc) (p) + +#endif + + using namespace std; using namespace Ice; using namespace IceSSL; diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h index ffa8a0c41e3..5e00e714678 100644 --- a/cpp/src/IceSSL/ConnectorI.h +++ b/cpp/src/IceSSL/ConnectorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_CONNECTOR_I_H +#define ICE_SSL_CONNECTOR_I_H #include <Ice/LoggerF.h> #include <Ice/TransceiverF.h> @@ -57,3 +58,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h index 732a2c2949c..d551bd0626a 100644 --- a/cpp/src/IceSSL/EndpointI.h +++ b/cpp/src/IceSSL/EndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_ENDPOINT_I_H +#define ICE_SSL_ENDPOINT_I_H #include <Ice/EndpointI.h> #include <Ice/EndpointFactory.h> @@ -84,3 +85,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h index 8c42ab53b86..55af46a6c99 100644 --- a/cpp/src/IceSSL/Instance.h +++ b/cpp/src/IceSSL/Instance.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_INSTANCE_H +#define ICE_SSL_INSTANCE_H #include <IceSSL/InstanceF.h> #include <IceSSL/UtilF.h> @@ -87,3 +88,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h index 3fd831308ad..0f731a0c174 100644 --- a/cpp/src/IceSSL/InstanceF.h +++ b/cpp/src/IceSSL/InstanceF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_INSTANCE_F_H +#define ICE_SSL_INSTANCE_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(IceSSL::Instance*); typedef IceInternal::Handle<Instance> InstancePtr; } + +#endif diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h index 9b54513d38d..10488ad6226 100644 --- a/cpp/src/IceSSL/PluginI.h +++ b/cpp/src/IceSSL/PluginI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_PLUGIN_I_H +#define ICE_SSL_PLUGIN_I_H #include <IceSSL/Plugin.h> #include <IceSSL/InstanceF.h> @@ -42,3 +43,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/RFC2253.h b/cpp/src/IceSSL/RFC2253.h index 0e769c20bb2..c70fb157d9f 100644 --- a/cpp/src/IceSSL/RFC2253.h +++ b/cpp/src/IceSSL/RFC2253.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_RFC_2253_H +#define ICE_SSL_RFC_2253_H #include <IceUtil/Config.h> #include <list> @@ -62,3 +63,5 @@ std::string unescape(const std::string&); } } + +#endif diff --git a/cpp/src/IceSSL/TransceiverI.h b/cpp/src/IceSSL/TransceiverI.h index d932895736f..dd94b787a7c 100644 --- a/cpp/src/IceSSL/TransceiverI.h +++ b/cpp/src/IceSSL/TransceiverI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_TRANSCEIVER_I_H +#define ICE_SSL_TRANSCEIVER_I_H #include <IceSSL/InstanceF.h> #include <IceSSL/Plugin.h> @@ -104,3 +105,5 @@ private: typedef IceUtil::Handle<TransceiverI> TransceiverIPtr; } + +#endif diff --git a/cpp/src/IceSSL/TrustManager.h b/cpp/src/IceSSL/TrustManager.h index 25cb1a4714a..5db65c2e978 100644 --- a/cpp/src/IceSSL/TrustManager.h +++ b/cpp/src/IceSSL/TrustManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_TRUST_MANAGER_H +#define ICE_SSL_TRUST_MANAGER_H #include <Ice/CommunicatorF.h> #include <IceSSL/TrustManagerF.h> @@ -46,3 +47,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/TrustManagerF.h b/cpp/src/IceSSL/TrustManagerF.h index 43333664258..e715c188ea8 100644 --- a/cpp/src/IceSSL/TrustManagerF.h +++ b/cpp/src/IceSSL/TrustManagerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_TRUST_MANAGER_F_H +#define ICE_SSL_TRUST_MANAGER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(IceSSL::TrustManager*); typedef IceInternal::Handle<TrustManager> TrustManagerPtr; } + +#endif diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h index 1e9f39dea91..80f5625a63b 100644 --- a/cpp/src/IceSSL/Util.h +++ b/cpp/src/IceSSL/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_UTIL_H +#define ICE_SSL_UTIL_H #include <IceSSL/UtilF.h> #include <Ice/Network.h> @@ -57,3 +58,5 @@ bool checkPath(std::string&, const std::string&, bool); std::string getSslErrors(bool); } + +#endif diff --git a/cpp/src/IceSSL/UtilF.h b/cpp/src/IceSSL/UtilF.h index acb311f7595..ee49435777d 100644 --- a/cpp/src/IceSSL/UtilF.h +++ b/cpp/src/IceSSL/UtilF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_UTIL_F_H +#define ICE_SSL_UTIL_F_H #include <IceUtil/Shared.h> @@ -25,3 +26,5 @@ typedef IceInternal::Handle<DHParams> DHParamsPtr; } #endif + +#endif diff --git a/cpp/src/IceStorm/DB.h b/cpp/src/IceStorm/DB.h index 87501b61f0d..0413ed11780 100644 --- a/cpp/src/IceStorm/DB.h +++ b/cpp/src/IceStorm/DB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef DATABASE_CACHE_H +#define DATABASE_CACHE_H #include <Ice/Plugin.h> #include <IceDB/IceDB.h> @@ -56,3 +57,6 @@ public: typedef IceUtil::Handle<DatabasePlugin> DatabasePluginPtr; } + + +#endif diff --git a/cpp/src/IceStorm/FreezeDB/FreezeDB.h b/cpp/src/IceStorm/FreezeDB/FreezeDB.h index d52d5e7f8c8..923d417b331 100644 --- a/cpp/src/IceStorm/FreezeDB/FreezeDB.h +++ b/cpp/src/IceStorm/FreezeDB/FreezeDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_DATABASE_CACHE_H +#define FREEZE_DATABASE_CACHE_H #include <IceDB/FreezeTypes.h> @@ -44,3 +45,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h index 71f9aa333eb..80f6c1a019d 100644 --- a/cpp/src/IceStorm/Instance.h +++ b/cpp/src/IceStorm/Instance.h @@ -7,7 +7,9 @@ // // ********************************************************************** -#pragma once +#ifndef INSTANCE_H +#define INSTANCE_H + #include <Ice/CommunicatorF.h> #include <Ice/ObjectAdapterF.h> @@ -102,3 +104,5 @@ private: typedef IceUtil::Handle<Instance> InstancePtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/NodeI.h b/cpp/src/IceStorm/NodeI.h index e8387da2961..f32de3a5d6a 100644 --- a/cpp/src/IceStorm/NodeI.h +++ b/cpp/src/IceStorm/NodeI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ELECTION_I_H +#define ELECTION_I_H #include <IceUtil/IceUtil.h> #include <Ice/Ice.h> @@ -197,3 +198,5 @@ private: }; } + +#endif // ELECTION_I_H diff --git a/cpp/src/IceStorm/Observers.h b/cpp/src/IceStorm/Observers.h index 1cac54a8b8e..b5bc223c77c 100644 --- a/cpp/src/IceStorm/Observers.h +++ b/cpp/src/IceStorm/Observers.h @@ -7,13 +7,19 @@ // // ********************************************************************** -#pragma once +#ifndef OBSERVERS_H +#define OBSERVERS_H #include <Ice/Ice.h> #include <IceUtil/IceUtil.h> #include <IceStorm/Election.h> #include <IceStorm/Replica.h> +#ifdef __SUNPRO_CC +# pragma error_messages(off,hidef) +#endif + + namespace IceStorm { class Instance; @@ -64,3 +70,9 @@ private: typedef IceUtil::Handle<Observers> ObserversPtr; } + +#ifdef __SUNPRO_CC +# pragma error_messages(default,hidef) +#endif + +#endif // OBSERVERS_H diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h index 2649be8a6db..aba6bd522fc 100644 --- a/cpp/src/IceStorm/Parser.h +++ b/cpp/src/IceStorm/Parser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STORM_PARSER_H +#define ICE_STORM_PARSER_H #include <IceUtil/Handle.h> #include <IceStorm/IceStorm.h> @@ -104,3 +105,5 @@ private: extern Parser* parser; // The current parser for bison/flex } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/Replica.h b/cpp/src/IceStorm/Replica.h index 7e131904bf1..be76437a499 100644 --- a/cpp/src/IceStorm/Replica.h +++ b/cpp/src/IceStorm/Replica.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef REPLICA_H +#define REPLICA_H #include <Ice/Ice.h> #include <IceStorm/Election.h> @@ -48,3 +49,5 @@ public: typedef IceUtil::Handle<Replica> ReplicaPtr; } + +#endif // RELICA_H diff --git a/cpp/src/IceStorm/Scanner.cpp b/cpp/src/IceStorm/Scanner.cpp index 7c38d13adde..e6e81e808f6 100644 --- a/cpp/src/IceStorm/Scanner.cpp +++ b/cpp/src/IceStorm/Scanner.cpp @@ -54,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -507,6 +498,16 @@ using namespace IceStorm; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) namespace IceStorm @@ -520,7 +521,7 @@ void initScanner(); } #define YY_USER_INIT initScanner(); -#line 523 "lex.yy.c" +#line 524 "lex.yy.c" #define INITIAL 0 @@ -601,12 +602,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -614,7 +610,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -625,7 +621,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -707,10 +703,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 63 "Scanner.l" +#line 73 "Scanner.l" -#line 713 "lex.yy.c" +#line 709 "lex.yy.c" if ( !(yy_init) ) { @@ -795,7 +791,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 65 "Scanner.l" +#line 75 "Scanner.l" { // C++-style comment int c; @@ -808,7 +804,7 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 75 "Scanner.l" +#line 85 "Scanner.l" { // C-style comment while(true) @@ -837,7 +833,7 @@ YY_RULE_SETUP case 3: /* rule 3 can match eol */ YY_RULE_SETUP -#line 100 "Scanner.l" +#line 110 "Scanner.l" { size_t len = strlen(yytext); for(size_t i = 0; i < len; ++i) @@ -852,14 +848,14 @@ YY_RULE_SETUP case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 111 "Scanner.l" +#line 121 "Scanner.l" { return ';'; } YY_BREAK case 5: YY_RULE_SETUP -#line 115 "Scanner.l" +#line 125 "Scanner.l" { // "..."-type strings string s; @@ -936,7 +932,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 189 "Scanner.l" +#line 199 "Scanner.l" { // '...'-type strings string s; @@ -964,7 +960,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 214 "Scanner.l" +#line 224 "Scanner.l" { // Simple strings string s; @@ -994,10 +990,10 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 241 "Scanner.l" +#line 251 "Scanner.l" ECHO; YY_BREAK -#line 1000 "lex.yy.c" +#line 996 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1751,8 +1747,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -1991,7 +1987,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 241 "Scanner.l" +#line 251 "Scanner.l" diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l index 4051c044020..30aeb5b44b4 100644 --- a/cpp/src/IceStorm/Scanner.l +++ b/cpp/src/IceStorm/Scanner.l @@ -38,6 +38,16 @@ using namespace IceStorm; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) namespace IceStorm diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h index f514f1b0040..9b9753e5db0 100644 --- a/cpp/src/IceStorm/Service.h +++ b/cpp/src/IceStorm/Service.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICESTORM_SERVICE_H +#define ICESTORM_SERVICE_H #include <IceBox/IceBox.h> #include <IceStorm/IceStorm.h> @@ -43,3 +44,5 @@ public: }; }; + +#endif diff --git a/cpp/src/IceStorm/SqlDB/SqlDB.h b/cpp/src/IceStorm/SqlDB/SqlDB.h index cf8cf750a84..a41b624fa43 100644 --- a/cpp/src/IceStorm/SqlDB/SqlDB.h +++ b/cpp/src/IceStorm/SqlDB/SqlDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_DATABASE_CACHE_H +#define SQL_DATABASE_CACHE_H #include <IceStorm/DB.h> @@ -56,3 +57,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceStorm/SqlDB/SqlLLU.h b/cpp/src/IceStorm/SqlDB/SqlLLU.h index 5fbdd87f067..b2f70652f55 100644 --- a/cpp/src/IceStorm/SqlDB/SqlLLU.h +++ b/cpp/src/IceStorm/SqlDB/SqlLLU.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_LLU_H +#define SQL_LLU_H #include <IceDB/SqlTypes.h> @@ -33,3 +34,5 @@ private: typedef IceUtil::Handle<SqlLLU> SqlLLUPtr; } + +#endif diff --git a/cpp/src/IceStorm/SqlDB/SqlSubscriberMap.h b/cpp/src/IceStorm/SqlDB/SqlSubscriberMap.h index 6509941b499..397e88bce12 100644 --- a/cpp/src/IceStorm/SqlDB/SqlSubscriberMap.h +++ b/cpp/src/IceStorm/SqlDB/SqlSubscriberMap.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_SUBSCRIBER_MAP_H +#define SQL_SUBSCRIBER_MAP_H #include <Ice/CommunicatorF.h> #include <IceStorm/SubscriberRecord.h> @@ -63,3 +64,5 @@ private: typedef IceUtil::Handle<SqlSubscriberMap> SqlSubscriberMapPtr; } + +#endif diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h index 52e07c2b137..ba66ac9e91c 100644 --- a/cpp/src/IceStorm/Subscriber.h +++ b/cpp/src/IceStorm/Subscriber.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SUBSCRIBER_H +#define SUBSCRIBER_H #include <IceStorm/IceStormInternal.h> #include <IceStorm/SubscriberRecord.h> @@ -92,3 +93,5 @@ bool operator!=(const IceStorm::Subscriber&, const IceStorm::Subscriber&); bool operator<(const IceStorm::Subscriber&, const IceStorm::Subscriber&); } + +#endif // SUBSCRIBER_H diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h index 023665ffbae..1de972c1856 100644 --- a/cpp/src/IceStorm/TopicI.h +++ b/cpp/src/IceStorm/TopicI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef TOPIC_I_H +#define TOPIC_I_H #include <IceStorm/IceStormInternal.h> #include <IceStorm/Election.h> @@ -103,3 +104,5 @@ private: typedef IceUtil::Handle<TopicImpl> TopicImplPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h index bb04b96a73f..98a9a32da51 100644 --- a/cpp/src/IceStorm/TopicManagerI.h +++ b/cpp/src/IceStorm/TopicManagerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef TOPIC_MANAGER_I_H +#define TOPIC_MANAGER_I_H #include <IceStorm/IceStorm.h> @@ -90,3 +91,5 @@ private: typedef IceUtil::Handle<TopicManagerImpl> TopicManagerImplPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h index b232bb9505a..bd860b4256f 100644 --- a/cpp/src/IceStorm/TraceLevels.h +++ b/cpp/src/IceStorm/TraceLevels.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STORM_TRACE_LEVELS_H +#define ICE_STORM_TRACE_LEVELS_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -45,3 +46,5 @@ public: typedef IceUtil::Handle<TraceLevels> TraceLevelsPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/TransientTopicI.h b/cpp/src/IceStorm/TransientTopicI.h index ac19a9493f0..f051ba3e5e0 100644 --- a/cpp/src/IceStorm/TransientTopicI.h +++ b/cpp/src/IceStorm/TransientTopicI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef TRANSIENT_TOPIC_I_H +#define TRANSIENT_TOPIC_I_H #include <IceStorm/IceStormInternal.h> @@ -75,3 +76,5 @@ private: typedef IceUtil::Handle<TransientTopicImpl> TransientTopicImplPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/TransientTopicManagerI.h b/cpp/src/IceStorm/TransientTopicManagerI.h index a00988a7a81..9edb2ec3c77 100644 --- a/cpp/src/IceStorm/TransientTopicManagerI.h +++ b/cpp/src/IceStorm/TransientTopicManagerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef TRANSIENT_TOPIC_MANAGER_I_H +#define TRANSIENT_TOPIC_MANAGER_I_H #include <IceStorm/IceStormInternal.h> @@ -54,3 +55,5 @@ private: typedef IceUtil::Handle<TransientTopicManagerImpl> TransientTopicManagerImplPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/Util.h b/cpp/src/IceStorm/Util.h index cb73d662280..128133e3bac 100644 --- a/cpp/src/IceStorm/Util.h +++ b/cpp/src/IceStorm/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef UTIL_H +#define UTIL_H #include <string> @@ -20,3 +21,4 @@ std::string describeEndpoints(const Ice::ObjectPrx&); } +#endif diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h index ae4e3d1c989..46155f9fa22 100644 --- a/cpp/src/IceUtil/ConvertUTF.h +++ b/cpp/src/IceUtil/ConvertUTF.h @@ -29,7 +29,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_CONVERT_UTF_H +#define ICE_UTIL_CONVERT_UTF_H #include <IceUtil/Unicode.h> @@ -140,3 +141,4 @@ ConversionResult ConvertUTF32toUTF8( /* --------------------------------------------------------------------- */ } +#endif diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp index d561cf70459..bdb53910031 100644 --- a/cpp/src/IceXML/Parser.cpp +++ b/cpp/src/IceXML/Parser.cpp @@ -323,8 +323,8 @@ startElementHandler(void* data, const XML_Char* name, const XML_Char** attr) attributes[attr[i]] = attr[i + 1]; } - int line = XML_GetCurrentLineNumber(cb->parser); - int column = XML_GetCurrentColumnNumber(cb->parser); + int line = static_cast<int>(XML_GetCurrentLineNumber(cb->parser)); + int column = static_cast<int>(XML_GetCurrentColumnNumber(cb->parser)); cb->handler->startElement(name, attributes, line, column); } @@ -332,8 +332,8 @@ static void endElementHandler(void* data, const XML_Char* name) { CallbackData* cb = static_cast<CallbackData*>(data); - int line = XML_GetCurrentLineNumber(cb->parser); - int column = XML_GetCurrentColumnNumber(cb->parser); + int line = static_cast<int>(XML_GetCurrentLineNumber(cb->parser)); + int column = static_cast<int>(XML_GetCurrentColumnNumber(cb->parser)); cb->handler->endElement(name, line, column); } @@ -343,8 +343,8 @@ characterDataHandler(void* data, const XML_Char* s, int len) CallbackData* cb = static_cast<CallbackData*>(data); string str(s, len); - int line = XML_GetCurrentLineNumber(cb->parser); - int column = XML_GetCurrentColumnNumber(cb->parser); + int line = static_cast<int>(XML_GetCurrentLineNumber(cb->parser)); + int column = static_cast<int>(XML_GetCurrentColumnNumber(cb->parser)); cb->handler->characters(str, line, column); } @@ -406,8 +406,9 @@ IceXML::Parser::parse(istream& in, Handler& handler) } if(XML_Parse(parser, buff, static_cast<int>(in.gcount()), isFinal) != 1) { - handler.error(XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser), - XML_GetCurrentColumnNumber(parser)); + handler.error(XML_ErrorString(XML_GetErrorCode(parser)), + static_cast<int>(XML_GetCurrentLineNumber(parser)), + static_cast<int>(XML_GetCurrentColumnNumber(parser))); return; } } diff --git a/cpp/src/Makefile b/cpp/src/Makefile index 4917e0a96ef..3c8cca006d0 100644 --- a/cpp/src/Makefile +++ b/cpp/src/Makefile @@ -11,6 +11,7 @@ top_srcdir = .. include $(top_srcdir)/config/Make.rules + ifeq ($(MinGW), yes) SUBDIRS = IceUtil \ Slice \ @@ -48,12 +49,46 @@ else ca endif -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +# +# Dependencies for 'all' target when using -jx +# + +Slice: IceUtil + +slice2cpp slice2cs slice2freeze slice2freezej slice2java slice2php slice2py slice2rb slice2html: Slice + +Ice: slice2cpp + +IceXML IceSSL Freeze FreezeScript IceBox Glacier2Lib IcePatch2Lib IceStormLib IceGridLib: Ice + +Freeze: slice2freeze + +FreezeScript IceDB: Freeze + +Glacier2 IceGridLib: Glacier2Lib + +IcePatch2: IcePatch2Lib + +IceStorm: IceBox IceDB IceGridLib + +IceGrid: IceGridLib IceStorm IcePatch2Lib IceDB + + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ - do \ - if test -d $$subdir ; \ - then \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - fi; \ - done + do \ + if test -d $$subdir ; \ + then \ + echo "making $@ in $$subdir"; \ + ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ + fi; \ + done + diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h index 756eda5d17b..c803152dd24 100644 --- a/cpp/src/Slice/GrammarUtil.h +++ b/cpp/src/Slice/GrammarUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_GRAMMAR_UTIL_H +#define SLICE_GRAMMAR_UTIL_H #include <Slice/Parser.h> @@ -214,3 +215,5 @@ int slice_parse(); // yyoverflow. // #define yyoverflow(a, b, c, d, e, f) yyerror(a) + +#endif diff --git a/cpp/src/Slice/MD5.h b/cpp/src/Slice/MD5.h index e9bad070237..ac9c02e2af0 100644 --- a/cpp/src/Slice/MD5.h +++ b/cpp/src/Slice/MD5.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_MD5_H +#define SLICE_MD5_H #include <IceUtil/Config.h> @@ -39,3 +40,5 @@ private: }; } + +#endif diff --git a/cpp/src/Slice/MD5I.h b/cpp/src/Slice/MD5I.h index 2ab51829250..66588283e83 100644 --- a/cpp/src/Slice/MD5I.h +++ b/cpp/src/Slice/MD5I.h @@ -47,7 +47,8 @@ 1999-05-03 lpd Original version. */ -#pragma once +#ifndef md5_INCLUDED +# define md5_INCLUDED /* * This package supports both compile-time and run-time determination of CPU @@ -86,3 +87,5 @@ void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); #ifdef __cplusplus } /* end extern "C" */ #endif + +#endif /* md5_INCLUDED */ diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index ecbc3b1b625..79a4241cf78 100755 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -2407,23 +2407,11 @@ Slice::Container::validateConstant(const string& name, const TypePtr& type, cons if(constant) { -#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x530) - // Strange Sun C++ 5.3 bug. - const IceUtil::HandleBase<SyntaxTreeBase>& hb = constant->type(); - lt = BuiltinPtr::dynamicCast(hb); -#else lt = BuiltinPtr::dynamicCast(constant->type()); -#endif } else { -#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x530) - // Strange Sun C++ 5.3 bug. - const IceUtil::HandleBase<SyntaxTreeBase>& hb = valueType; - lt = BuiltinPtr::dynamicCast(hb); -#else lt = BuiltinPtr::dynamicCast(valueType); -#endif } if(lt) diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp index 54541891c2e..87667e38132 100644 --- a/cpp/src/Slice/Scanner.cpp +++ b/cpp/src/Slice/Scanner.cpp @@ -74,6 +74,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -104,8 +105,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -162,15 +161,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -591,6 +582,16 @@ char *slice_text; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef slice_wrap +# undef slice_wrap +# define slice_wrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + using namespace std; using namespace Slice; @@ -612,7 +613,7 @@ int checkKeyword(string&); -#line 615 "lex.yy.c" +#line 616 "lex.yy.c" #define INITIAL 0 #define BOMSCAN 1 @@ -695,12 +696,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -708,7 +704,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( slice_text, slice_leng, 1, slice_out )) {} } while (0) +#define ECHO fwrite( slice_text, slice_leng, 1, slice_out ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -719,7 +715,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( slice_in )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -804,10 +800,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 75 "Scanner.l" +#line 85 "Scanner.l" -#line 810 "lex.yy.c" +#line 806 "lex.yy.c" if ( !(yy_init) ) { @@ -892,7 +888,7 @@ case 1: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up slice_text again */ YY_RULE_SETUP -#line 77 "Scanner.l" +#line 87 "Scanner.l" { if(unit->scanPosition(slice_text)) { @@ -906,7 +902,7 @@ case 2: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up slice_text again */ YY_RULE_SETUP -#line 84 "Scanner.l" +#line 94 "Scanner.l" { if(unit->scanPosition(slice_text)) { @@ -919,7 +915,7 @@ case 3: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up slice_text again */ YY_RULE_SETUP -#line 91 "Scanner.l" +#line 101 "Scanner.l" { if(unit->scanPosition(slice_text)) { @@ -933,7 +929,7 @@ case 4: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up slice_text again */ YY_RULE_SETUP -#line 98 "Scanner.l" +#line 108 "Scanner.l" { if(unit->scanPosition(slice_text)) { @@ -943,7 +939,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 105 "Scanner.l" +#line 115 "Scanner.l" { // C++-style comment BEGIN(MAINSCAN); @@ -961,7 +957,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 120 "Scanner.l" +#line 130 "Scanner.l" { // C-style comment BEGIN(MAINSCAN); @@ -1005,7 +1001,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 161 "Scanner.l" +#line 171 "Scanner.l" { BEGIN(MAINSCAN); return ICE_SCOPE_DELIMITER; @@ -1013,7 +1009,7 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 166 "Scanner.l" +#line 176 "Scanner.l" { BEGIN(MAINSCAN); return ICE_METADATA_OPEN; @@ -1021,7 +1017,7 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 171 "Scanner.l" +#line 181 "Scanner.l" { BEGIN(MAINSCAN); return ICE_METADATA_CLOSE; @@ -1029,7 +1025,7 @@ YY_RULE_SETUP YY_BREAK case 10: YY_RULE_SETUP -#line 176 "Scanner.l" +#line 186 "Scanner.l" { BEGIN(MAINSCAN); return ICE_GLOBAL_METADATA_OPEN; @@ -1037,7 +1033,7 @@ YY_RULE_SETUP YY_BREAK case 11: YY_RULE_SETUP -#line 181 "Scanner.l" +#line 191 "Scanner.l" { BEGIN(MAINSCAN); return ICE_GLOBAL_METADATA_CLOSE; @@ -1046,7 +1042,7 @@ YY_RULE_SETUP case 12: /* rule 12 can match eol */ YY_RULE_SETUP -#line 186 "Scanner.l" +#line 196 "Scanner.l" { BEGIN(MAINSCAN); StringTokPtr ident = new StringTok; @@ -1074,7 +1070,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 211 "Scanner.l" +#line 221 "Scanner.l" { BEGIN(MAINSCAN); StringTokPtr ident = new StringTok; @@ -1085,7 +1081,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 219 "Scanner.l" +#line 229 "Scanner.l" { BEGIN(MAINSCAN); StringTokPtr str = new StringTok; @@ -1249,7 +1245,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 380 "Scanner.l" +#line 390 "Scanner.l" { BEGIN(MAINSCAN); IntegerTokPtr itp = new IntegerTok; @@ -1268,7 +1264,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 396 "Scanner.l" +#line 406 "Scanner.l" { BEGIN(MAINSCAN); errno = 0; @@ -1302,7 +1298,7 @@ YY_RULE_SETUP case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 426 "Scanner.l" +#line 436 "Scanner.l" { // Ignore white-space @@ -1318,7 +1314,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 439 "Scanner.l" +#line 449 "Scanner.l" { // Ignore UTF-8 BOM, rule only active when parsing start of file. @@ -1327,7 +1323,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 445 "Scanner.l" +#line 455 "Scanner.l" { BEGIN(MAINSCAN); if(slice_text[0] < 32 || slice_text[0] > 126) @@ -1346,10 +1342,10 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 461 "Scanner.l" +#line 471 "Scanner.l" ECHO; YY_BREAK -#line 1352 "lex.yy.c" +#line 1348 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(BOMSCAN): case YY_STATE_EOF(MAINSCAN): @@ -2109,8 +2105,8 @@ YY_BUFFER_STATE slice__scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to slice_lex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -2349,7 +2345,7 @@ void slice_free (void * ptr ) #define YYTABLES_NAME "yytables" -#line 461 "Scanner.l" +#line 471 "Scanner.l" diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l index 2363abeb847..1d981e3e567 100644 --- a/cpp/src/Slice/Scanner.l +++ b/cpp/src/Slice/Scanner.l @@ -37,6 +37,16 @@ # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef slice_wrap +# undef slice_wrap +# define slice_wrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + using namespace std; using namespace Slice; diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/Util.cpp index c8d98fc400f..8e0fe4c8bdc 100644 --- a/cpp/src/Slice/Util.cpp +++ b/cpp/src/Slice/Util.cpp @@ -115,7 +115,7 @@ Slice::fullPath(const string& path) } char buf[PATH_MAX + 1]; - int len = readlink(subpath.c_str(), buf, sizeof(buf)); + int len = static_cast<int>(readlink(subpath.c_str(), buf, sizeof(buf))); if(len > 0) { buf[len] = '\0'; diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h index 8efa7d3287e..b061276e776 100644 --- a/cpp/src/iceserviceinstall/ServiceInstaller.h +++ b/cpp/src/iceserviceinstall/ServiceInstaller.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVICE_INSTALLER_H +#define ICE_SERVICE_INSTALLER_H #include <Ice/Ice.h> #include <AccCtrl.h> @@ -66,3 +67,5 @@ private: bool _debug; }; + +#endif diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h index 5caa7521e50..90d02809368 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.h +++ b/cpp/src/slice2confluence/ConfluenceOutput.h @@ -1,13 +1,5 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#pragma once +#ifndef CONFLUENCE_OUTPUT +#define CONFLUENCE_OUTPUT #include <IceUtil/OutputUtil.h> #include <list> @@ -196,3 +188,5 @@ operator<<(ConfluenceOutput& o, const EndEscapes&) ConfluenceOutput& operator<<(ConfluenceOutput&, std::ios_base& (*)(std::ios_base&)); } + +#endif diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h index 2b563fe04b4..65469d5dc05 100644 --- a/cpp/src/slice2confluence/Gen.h +++ b/cpp/src/slice2confluence/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -291,3 +292,5 @@ private: }; } + +#endif diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 53ef4dea799..3a2f2a2b4d1 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -214,12 +214,12 @@ Slice::Gen::Gen(const string& base, const string& headerExtension, const string& Slice::Gen::~Gen() { - H << '\n'; + H << "\n\n#endif\n"; C << '\n'; if(_impl) { - implH << '\n'; + implH << "\n\n#endif\n"; implC << '\n'; } } @@ -280,7 +280,15 @@ Slice::Gen::generate(const UnitPtr& p) } FileTracker::instance()->addFile(fileImplC); - implH << "#pragma once\n"; + string s = fileImplH; + if(_include.size()) + { + s = _include + '/' + s; + } + transform(s.begin(), s.end(), s.begin(), ToIfdef()); + implH << "#ifndef __" << s << "__"; + implH << "\n#define __" << s << "__"; + implH << '\n'; } string fileH = _base + "." + _headerExtension; @@ -314,7 +322,16 @@ Slice::Gen::generate(const UnitPtr& p) printHeader(C); printGeneratedHeader(C, _base + ".ice"); - H << "#pragma once\n"; + + string s = fileH; + if(_include.size()) + { + s = _include + '/' + s; + } + transform(s.begin(), s.end(), s.begin(), ToIfdef()); + H << "\n#ifndef __" << s << "__"; + H << "\n#define __" << s << "__"; + H << '\n'; validateMetaData(p); diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index 941b2a90e12..9d05ca2a8b5 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -450,3 +451,5 @@ private: }; } + +#endif diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index c0a19a334ce..9d1de88c85e 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -2915,7 +2915,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p) for(d = allDataMembers.begin(); d != allDataMembers.end(); ++d) { string memberName = fixId((*d)->name()); - string memberType = typeToString((*d)->type()); + string memberType = typeToString((*d)->type(), (*d)->optional()); paramDecl.push_back(memberType + " " + memberName); } _out << paramDecl << epar; @@ -2943,14 +2943,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p) { _out << paramName; } - if((*d)->optional()) - { - _out << " = new " << typeToString((*d)->type(), true) << '(' << paramName << ");"; - } - else - { - _out << " = " << paramName << ';'; - } + _out << " = " << paramName << ';'; } _out << eb; @@ -3254,7 +3247,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) for(q = allDataMembers.begin(); q != allDataMembers.end(); ++q) { string memberName = fixId((*q)->name()); - string memberType = typeToString((*q)->type()); + string memberType = typeToString((*q)->type(), (*q)->optional()); allParamDecl.push_back(memberType + " " + memberName); } @@ -3268,7 +3261,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) for(q = dataMembers.begin(); q != dataMembers.end(); ++q) { string memberName = fixId((*q)->name()); - string memberType = typeToString((*q)->type()); + string memberType = typeToString((*q)->type(), (*q)->optional()); paramDecl.push_back(memberType + " " + memberName); } @@ -3330,15 +3323,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) for(q = dataMembers.begin(); q != dataMembers.end(); ++q) { string name = fixId((*q)->name(), DotNet::Exception, false); - if((*q)->optional()) - { - _out << nl << "this." << name << " = new " << typeToString((*q)->type(), true) << '(' << - fixId((*q)->name()) << ");"; - } - else - { - _out << nl << "this." << name << " = " << fixId((*q)->name()) << ';'; - } + _out << nl << "this." << name << " = " << fixId((*q)->name()) << ';'; } _out << eb; } diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h index 597bf5a11d4..a8ff7998842 100644 --- a/cpp/src/slice2cs/Gen.h +++ b/cpp/src/slice2cs/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/CsUtil.h> @@ -314,3 +315,5 @@ private: }; } + +#endif diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 2d2020f10a2..bc855817352 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -1454,7 +1454,11 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co } } - H << "#pragma once\n"; + string s = fileH; + transform(s.begin(), s.end(), s.begin(), ToIfdef()); + H << "\n#ifndef __" << s << "__"; + H << "\n#define __" << s << "__"; + H << '\n'; if(dicts.size() > 0) { @@ -1503,7 +1507,7 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co } } - H << "\n\n"; + H << "\n\n#endif\n"; CPP << '\n'; H.close(); diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp index a08642d2650..ff267b46e99 100755 --- a/cpp/src/slice2freezej/Main.cpp +++ b/cpp/src/slice2freezej/Main.cpp @@ -100,7 +100,13 @@ public: void generate(UnitPtr&, const Index&); +#ifdef __SUNPRO_CC +protected: + using JavaGenerator::typeToObjectString; +#endif + private: + string typeToObjectString(const TypePtr&); string varToObject(const TypePtr&, const string&); string objectToVar(const TypePtr&, const string&); diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h index 1d526ccd15c..e0ecdc58651 100644 --- a/cpp/src/slice2html/Gen.h +++ b/cpp/src/slice2html/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -266,3 +267,5 @@ private: }; } + +#endif diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 1a9b678b6aa..1b049475ffd 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -2442,22 +2442,7 @@ Slice::Gen::TieVisitor::visitClassDefStart(const ClassDefPtr& p) const bool hasAMD = cl->hasMetaData("amd") || (*r)->hasMetaData("amd"); const bool optionalMapping = useOptionalMapping(*r); -#if defined(__SUNPRO_CC) && (__SUNPRO_CC==0x550) - // - // Work around for Sun CC 5.5 bug #4853566 - // - string opName; - if(hasAMD) - { - opName = (*r)->name() + "_async"; - } - else - { - opName = fixKwd((*r)->name()); - } -#else string opName = hasAMD ? (*r)->name() + "_async" : fixKwd((*r)->name()); -#endif TypePtr ret = (*r)->returnType(); string retS = typeToString(ret, TypeModeReturn, package, (*r)->getMetaData(), true, diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h index e8b12e3743b..94f0dc95a2d 100644 --- a/cpp/src/slice2java/Gen.h +++ b/cpp/src/slice2java/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/Parser.h> #include <Slice/JavaUtil.h> @@ -336,3 +337,5 @@ private: }; } + +#endif diff --git a/cpp/test/Freeze/Makefile b/cpp/test/Freeze/Makefile index fe06d1c902f..4646b63bd7b 100644 --- a/cpp/test/Freeze/Makefile +++ b/cpp/test/Freeze/Makefile @@ -13,7 +13,16 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = dbmap complex evictor fileLock -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/Freeze/complex/Scanner.cpp b/cpp/test/Freeze/complex/Scanner.cpp index 57f18d355a4..a3f371f18bc 100644 --- a/cpp/test/Freeze/complex/Scanner.cpp +++ b/cpp/test/Freeze/complex/Scanner.cpp @@ -54,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -502,9 +493,19 @@ using namespace Ice; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) -#line 507 "lex.yy.c" +#line 508 "lex.yy.c" #define INITIAL 0 @@ -585,12 +586,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -598,7 +594,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -609,7 +605,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -691,10 +687,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 52 "Scanner.l" +#line 62 "Scanner.l" -#line 697 "lex.yy.c" +#line 693 "lex.yy.c" if ( !(yy_init) ) { @@ -775,7 +771,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 54 "Scanner.l" +#line 64 "Scanner.l" { *yylvalp = new Complex::NumberNodeI(atoi(yytext)); return TOK_NUMBER; @@ -783,20 +779,20 @@ YY_RULE_SETUP YY_BREAK case 2: YY_RULE_SETUP -#line 59 "Scanner.l" +#line 69 "Scanner.l" /* eat whitespace */ YY_BREAK case 3: YY_RULE_SETUP -#line 61 "Scanner.l" +#line 71 "Scanner.l" { return *yytext; } YY_BREAK case 4: YY_RULE_SETUP -#line 63 "Scanner.l" +#line 73 "Scanner.l" ECHO; YY_BREAK -#line 799 "lex.yy.c" +#line 795 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1551,8 +1547,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ @@ -1791,7 +1787,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 63 "Scanner.l" +#line 73 "Scanner.l" diff --git a/cpp/test/Freeze/complex/Scanner.l b/cpp/test/Freeze/complex/Scanner.l index 4b309f6a16f..4461779e8df 100644 --- a/cpp/test/Freeze/complex/Scanner.l +++ b/cpp/test/Freeze/complex/Scanner.l @@ -38,6 +38,16 @@ using namespace Ice; # define YY_NO_UNISTD_H #endif +#ifdef __SUNPRO_CC +# ifdef yywrap +# undef yywrap +# define yywrap() 1 +# endif +# ifdef ICE_64 +# pragma error_messages(off,truncwarn) +# endif +#endif + #define YY_INPUT(buf, result, maxSize) parser->getInput(buf, result, maxSize) %} diff --git a/cpp/test/FreezeScript/Makefile b/cpp/test/FreezeScript/Makefile index 19c65152af0..c93def73f77 100644 --- a/cpp/test/FreezeScript/Makefile +++ b/cpp/test/FreezeScript/Makefile @@ -13,7 +13,15 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = dbmap evictor -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/FreezeScript/evictor/makedb.cpp b/cpp/test/FreezeScript/evictor/makedb.cpp index 04ef9f23ecc..a9a187ac75c 100644 --- a/cpp/test/FreezeScript/evictor/makedb.cpp +++ b/cpp/test/FreezeScript/evictor/makedb.cpp @@ -14,6 +14,10 @@ using namespace std; using namespace Test; +#ifdef __SUNPRO_CC +# pragma error_messages(off,hidef) +#endif + class MainObjectI : public MainObject, public IceUtil::AbstractMutexI<IceUtil::Mutex> { }; diff --git a/cpp/test/Glacier2/Makefile b/cpp/test/Glacier2/Makefile index 2f523c71bd7..cd11faa4d66 100644 --- a/cpp/test/Glacier2/Makefile +++ b/cpp/test/Glacier2/Makefile @@ -20,7 +20,16 @@ SUBDIRS = router \ sessionHelper \ ssl -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp index 8bf60e35a6c..254ad73cdde 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/Makefile b/cpp/test/Ice/Makefile index a8446f3d55b..5129afcc199 100644 --- a/cpp/test/Ice/Makefile +++ b/cpp/test/Ice/Makefile @@ -46,7 +46,15 @@ SUBDIRS = proxy \ plugin \ admin -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/Ice/background/Makefile b/cpp/test/Ice/background/Makefile index 2e1c7f1361c..c4fc28cc07f 100644 --- a/cpp/test/Ice/background/Makefile +++ b/cpp/test/Ice/background/Makefile @@ -28,7 +28,8 @@ SOBJS = Configuration.o \ TestI.o \ Server.o -TRANSPORT_OBJS = Configuration.o \ +TRANSPORT_OBJS = Test.o \ + Configuration.o \ Connector.o \ Acceptor.o \ EndpointI.o \ diff --git a/cpp/test/Ice/checksum/Makefile b/cpp/test/Ice/checksum/Makefile index 0ea0d7d8f31..c87950dbead 100644 --- a/cpp/test/Ice/checksum/Makefile +++ b/cpp/test/Ice/checksum/Makefile @@ -34,7 +34,16 @@ $(CLIENT): $(COBJS) SUBDIRS = server -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/Ice/custom/Makefile b/cpp/test/Ice/custom/Makefile index 1f6857bf339..45b64403cd0 100644 --- a/cpp/test/Ice/custom/Makefile +++ b/cpp/test/Ice/custom/Makefile @@ -65,6 +65,20 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I../../include $(CPPFLAGS) SLICE2CPPFLAGS := --stream $(SLICE2CPPFLAGS) +# +# Disables optimization when building with Solaris CC: +# AllTests.cpp takes a very very long time to compile with -O +# +ifeq ($(UNAME),SunOS) +ifeq ($(CXX),CC) +ifeq ($(OPTIMIZE),yes) + +AllTests.o: AllTests.cpp + $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -xO0 $< +endif +endif +endif + $(CLIENT): $(COBJS) rm -f $@ $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) diff --git a/cpp/test/Ice/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice index 9662adb807c..f80e031a302 100644 --- a/cpp/test/Ice/exceptions/TestAMD.ice +++ b/cpp/test/Ice/exceptions/TestAMD.ice @@ -12,6 +12,10 @@ module Test { +interface Empty +{ +}; + interface Thrower; exception Base {}; diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp index ca859d07c36..9030bb174ba 100644 --- a/cpp/test/Ice/interceptor/Client.cpp +++ b/cpp/test/Ice/interceptor/Client.cpp @@ -38,7 +38,7 @@ private: }; #ifndef _WIN32 -void testAction(int) +extern "C" void testAction(int) { test(false); } diff --git a/cpp/test/Ice/slicing/Makefile b/cpp/test/Ice/slicing/Makefile index 3fe9fc287a0..72a818e69ca 100644 --- a/cpp/test/Ice/slicing/Makefile +++ b/cpp/test/Ice/slicing/Makefile @@ -14,7 +14,15 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = exceptions \ objects -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/IceBox/Makefile b/cpp/test/IceBox/Makefile index 02bc076caaf..43d71b66728 100644 --- a/cpp/test/IceBox/Makefile +++ b/cpp/test/IceBox/Makefile @@ -14,7 +14,16 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = admin configuration -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/IceGrid/Makefile b/cpp/test/IceGrid/Makefile index d7f9be71315..cac5f779903 100644 --- a/cpp/test/IceGrid/Makefile +++ b/cpp/test/IceGrid/Makefile @@ -14,7 +14,17 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = simple deployer session update noRestartUpdate activation replicaGroup allocation replication distribution admin -$(EVERYTHING):: + +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/IceSSL/Makefile b/cpp/test/IceSSL/Makefile index 789871dbfbe..e2d5291339f 100644 --- a/cpp/test/IceSSL/Makefile +++ b/cpp/test/IceSSL/Makefile @@ -13,7 +13,15 @@ include $(top_srcdir)/config/Make.rules SUBDIRS = configuration -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/IceStorm/Makefile b/cpp/test/IceStorm/Makefile index 71a5dc2abe9..e35f62f9eb1 100644 --- a/cpp/test/IceStorm/Makefile +++ b/cpp/test/IceStorm/Makefile @@ -19,7 +19,16 @@ SUBDIRS = single \ repstress \ repgrid -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/IceUtil/Makefile b/cpp/test/IceUtil/Makefile index 505bb81c3c7..8528be0e826 100644 --- a/cpp/test/IceUtil/Makefile +++ b/cpp/test/IceUtil/Makefile @@ -21,7 +21,15 @@ SUBDIRS = condvar \ priority \ fileLock -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/IceUtil/priority/PriorityInversion.cpp b/cpp/test/IceUtil/priority/PriorityInversion.cpp index 85be93965ed..ca65f177527 100644 --- a/cpp/test/IceUtil/priority/PriorityInversion.cpp +++ b/cpp/test/IceUtil/priority/PriorityInversion.cpp @@ -298,7 +298,7 @@ PriorityInversionTest::run() { return; // Mutex protocol PrioInherit not supported } - cores = sysconf(_SC_NPROCESSORS_ONLN); + cores = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN)); high = 45; medium = 35; low = 1; diff --git a/cpp/test/Makefile b/cpp/test/Makefile index a56cf17c9f0..403c998684b 100644 --- a/cpp/test/Makefile +++ b/cpp/test/Makefile @@ -26,7 +26,16 @@ SUBDIRS := $(SUBDIRS) \ IceGrid endif -$(EVERYTHING):: + +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ diff --git a/cpp/test/Slice/Makefile b/cpp/test/Slice/Makefile index 743ad97868b..8c771fe6531 100644 --- a/cpp/test/Slice/Makefile +++ b/cpp/test/Slice/Makefile @@ -15,7 +15,16 @@ SUBDIRS = keyword \ parser \ structure -$(EVERYTHING):: +.PHONY: $(EVERYTHING) $(SUBDIRS) + +all:: $(SUBDIRS) + +$(SUBDIRS): + @echo "making all in $@" + @$(MAKE) all --directory=$@ + + +$(EVERYTHING_EXCEPT_ALL):: @for subdir in $(SUBDIRS); \ do \ echo "making $@ in $$subdir"; \ |