Added a -ansi flag to charmxi, and options to enable it in conv-mach.csh
authorRobert Brunner <rbrunner@uiuc.edu>
Tue, 29 Jun 1999 21:55:51 +0000 (21:55 +0000)
committerRobert Brunner <rbrunner@uiuc.edu>
Tue, 29 Jun 1999 21:55:51 +0000 (21:55 +0000)
and conv-mach.h

85 files changed:
src/arch/exemplar-mpi/conv-mach.csh
src/arch/exemplar-mpi/conv-mach.h
src/arch/exemplar/conv-mach.csh
src/arch/exemplar/conv-mach.h
src/arch/linux-mpi/conv-mach.csh
src/arch/linux-mpi/conv-mach.h
src/arch/ncube2/conv-mach.csh
src/arch/ncube2/conv-mach.h
src/arch/net-aix-ppc/conv-mach.csh
src/arch/net-aix-ppc/conv-mach.h
src/arch/net-axp/conv-mach.csh
src/arch/net-axp/conv-mach.h
src/arch/net-hp-acc/conv-mach.csh
src/arch/net-hp-acc/conv-mach.h
src/arch/net-hp-cc/conv-mach.csh
src/arch/net-hp-cc/conv-mach.h
src/arch/net-hp/conv-mach.csh
src/arch/net-hp/conv-mach.h
src/arch/net-irix-64/conv-mach.csh
src/arch/net-irix-64/conv-mach.h
src/arch/net-irix/conv-mach.csh
src/arch/net-irix/conv-mach.h
src/arch/net-linux-kcc/conv-mach.csh
src/arch/net-linux-kcc/conv-mach.h
src/arch/net-linux-smp/conv-mach.csh
src/arch/net-linux-smp/conv-mach.h
src/arch/net-linux/conv-mach.csh
src/arch/net-linux/conv-mach.h
src/arch/net-sol-cc/conv-mach.csh
src/arch/net-sol-cc/conv-mach.h
src/arch/net-sol-smp/conv-mach.csh
src/arch/net-sol-smp/conv-mach.h
src/arch/net-sol/conv-mach.csh
src/arch/net-sol/conv-mach.h
src/arch/net-sun/conv-mach.csh
src/arch/net-sun/conv-mach.h
src/arch/origin-mpi/conv-mach.csh
src/arch/origin-mpi/conv-mach.h
src/arch/origin-pthreads/conv-mach.csh
src/arch/origin-pthreads/conv-mach.h
src/arch/origin2000/conv-mach.csh
src/arch/origin2000/conv-mach.h
src/arch/paragon-red/conv-mach.csh
src/arch/paragon-red/conv-mach.h
src/arch/sim-hp/conv-mach.csh
src/arch/sim-hp/conv-mach.h
src/arch/sim-irix-64/conv-mach.csh
src/arch/sim-irix-64/conv-mach.h
src/arch/sim-irix/conv-mach.csh
src/arch/sim-irix/conv-mach.h
src/arch/sim-linux/conv-mach.csh
src/arch/sim-linux/conv-mach.h
src/arch/sim-rs6k/conv-mach.csh
src/arch/sim-rs6k/conv-mach.h
src/arch/sim-sol/conv-mach.csh
src/arch/sim-sol/conv-mach.h
src/arch/sim-sun/conv-mach.csh
src/arch/sim-sun/conv-mach.h
src/arch/sp3/conv-mach.csh
src/arch/sp3/conv-mach.h
src/arch/t3e/conv-mach.csh
src/arch/t3e/conv-mach.h
src/arch/uth-axp-cc/conv-mach.csh
src/arch/uth-axp-cc/conv-mach.h
src/arch/uth-hp-cc/conv-mach.csh
src/arch/uth-hp-cc/conv-mach.h
src/arch/uth-hp/conv-mach.csh
src/arch/uth-hp/conv-mach.h
src/arch/uth-irix-64/conv-mach.csh
src/arch/uth-irix-64/conv-mach.h
src/arch/uth-irix/conv-mach.csh
src/arch/uth-irix/conv-mach.h
src/arch/uth-linux/conv-mach.csh
src/arch/uth-linux/conv-mach.h
src/arch/uth-rs6k/conv-mach.csh
src/arch/uth-rs6k/conv-mach.h
src/arch/uth-sol-cc/conv-mach.csh
src/arch/uth-sol-cc/conv-mach.h
src/arch/uth-sol/conv-mach.csh
src/arch/uth-sol/conv-mach.h
src/ck-core/charm++.h
src/scripts/charmc
src/xlat-i/xi-main.C
src/xlat-i/xi-symbol.C
src/xlat-i/xi-symbol.h

index dc574c1cb9cac0f98da4cd5716ad6b39c9a1426d..525f533b437f277246e70d7b611475b7ce591488 100644 (file)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='CC'
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='convex'
+set CMK_XIOPTS=''
index abe1b36bead70989c418377230e5180680df81b9..a202ab3dca825ca18051af5590e629f0727d3ebe 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index 8db3802abd244b13cfa1521e01c8adf3f6d54e14..a848fce79dfefda721d885257f196b79c3af252a 100755 (executable)
@@ -27,3 +27,5 @@ set CMK_SEQ_LDXX='CC'
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='convex'
+set CMK_XIOPTS=''
+
index 6c152f2f478b50e3434ed6f574eb7754e366ac71..a6c34a312f5b07f8d36feb7e6d84e0347466c266 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                               0
 #define CMK_DONT_USE_HP_MAIN_FIX                          1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index 491d74c7a69085d46cd2c063e3cdac426c42159a..4515a159ee202e4973a0d7543fd83c34e66539e3 100755 (executable)
@@ -26,3 +26,5 @@ set CMK_SEQ_LDXX='KCC'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='generic'
+set CMK_XIOPTS=''
+
index e5c0ee294fb29abb405811de32fbf57f874b793a..07b750136416ccf49eaaafedfbff37c7349c54a4 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index ab2f31ef6f3bce8b5807e7169c3cce43f0433cd4..3cb3e2d7c7fcb0cc3f491c492ed961d9cb2d3235 100644 (file)
@@ -27,3 +27,5 @@ set CMK_SEQ_LDXX='CC'
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='ncube2'
+set CMK_XIOPTS=''
+
index 524319bb92ba18d72e127b810922b4cd10e28ac0..c846b5ec33cbeb94e86299d82bd5ce007d55c79d 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 1a8eaaf1bd118419f57fd9e73ac781903b3a9d4d..91953cdaff91c2faf35c540a58188f276aab9998 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ -w'
 set CMK_QT='aix32-gcc'
+set CMK_XIOPTS=''
index fe630e13bae08ccf5f395bd001c9f439369a69fc..f4fb534e5f50dfae2ead6a80373ae87949d24130 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 051f92ae1eee20ff5dc9bc0f042ab5236074c377..6f2d91b9b5bb215f8fff9e89f0c57a891ebed955 100755 (executable)
@@ -27,3 +27,5 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='axp-gcc'
+set CMK_XIOPTS=''
+
index 40836747ed144d6fd9406115055b554332369dbd..1883fad62ae6c3079f306b1855bad484190ecfca 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index afcb3ec0c606a9ee4733bfc1be6533189499ebbb..1c357a2778ac828b7c31796b4114c0df1f538d7b 100644 (file)
@@ -27,3 +27,5 @@ set CMK_SEQ_LDXX='aCC +DAportable -D_HPUX_SOURCE '
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='hpux-cc'
+set CMK_XIOPTS=''
+
index eb462d08c64483c11390fc85f4365b115ff7fd17..50eeda6a322e4d0d1e4f726d53000c218ee6fd78 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                1
 #define CMK_DONT_USE_HP_MAIN_FIX                           0
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index 8735c3b9d8d0637e1ca10090d9abdafa498ffdb7..7affd00721999ea40c6a7ce5fbc47b0b635d999a 100644 (file)
@@ -27,3 +27,5 @@ set CMK_SEQ_LDXX='CC -Aa -D_HPUX_SOURCE +DAportable '
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='hpux-cc'
+set CMK_XIOPTS=''
+
index b9360ccf86922d45ca97d40bcb37269470e04938..1cd1ee4bd0242f03ddd1f321e93c925d9e5d883a 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                1
 #define CMK_DONT_USE_HP_MAIN_FIX                           0
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index 7acccf5bd6d44ca7e853ed05fb0c12e1298e2eb3..4da8a47c8eb8401202f1d3d50b4cbc6a62fa1ccf 100644 (file)
@@ -27,3 +27,5 @@ set CMK_SEQ_LDXX='g++ -static '
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ -w'
 set CMK_QT='hpux-gcc'
+set CMK_XIOPTS=''
+
index c12ddaaa7865289db9015dbcb26e97563f26c78a..f1bb1b1c63826867741fc18928858ab3c3440cb5 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index b4e877c2f9d3a681223814810e4ca0ab93f2bf84..5cdf0ee3dbdbb8f5f0112b7efbccf7c5ef968853 100755 (executable)
@@ -31,3 +31,5 @@ set CMK_NM_FILTER="grep '|GLOB |' | sed -e 's/.*|//'"
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ -w '
 set CMK_QT='origin'
+set CMK_XIOPTS=''
+
index 1cf1e8119c978b5c3ee0368f6e0ea754faf98ef9..f567d219a632d97e4427089ed7a526afb040a75c 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 95898b60b8447caa65af00b31246097cd9bdbc04..736cfcbc4c94191207eae9d5f7d7d76b21b264f1 100755 (executable)
@@ -27,3 +27,5 @@ set CMK_SEQ_LDXX='CC -w -n32 '
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++  '
 set CMK_QT='irix5-cc'
+set CMK_XIOPTS=''
+
index 247dac6cf0fc2d8df6c60f337813ca7876446ba4..b133d2d1761fe89038e5e7a75fb7a3d427ee8d07 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 013f47963760a8a9234661011fa1b367b3c053a7..f4b4fbe26c443671bcb17537f849a47b0f757007 100755 (executable)
@@ -27,3 +27,5 @@ set CMK_SEQ_LDXX='KCC'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='generic'
+set CMK_XIOPTS='-ansi'
+
index 7794d4ecb105194903fc5b8ed5929f579bada0bf..ab4268327b00277cc17e4c9466c5af0e6533da85 100644 (file)
 #define CMK_WEB_MODE                                       1
 #define CMK_USE_PERSISTENT_CCS                             1
 
+#define CMK_COMPILEMODE_ORIG                               0
+#define CMK_COMPILEMODE_ANSI                               1
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index 397338f10d6f622bfcb4a018c364b43aa15b35ed..3f96227347704ae25505ee88383935f4539487fd 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='generic'
+set CMK_XIOPTS=''
index a156629d155df7b5a0ffc09398e1a612eb1536ca..cdf0bb6ece41dd7af09cbcae3f0ce07f6f150cfb 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index 397338f10d6f622bfcb4a018c364b43aa15b35ed..3f96227347704ae25505ee88383935f4539487fd 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='generic'
+set CMK_XIOPTS=''
index 2b5b56089d3a7b5140b75bc9fcc8c29ea0776e44..c717825491f4e55efc06e426d7940668c974a9e7 100644 (file)
 #define CMK_WEB_MODE                                       1
 #define CMK_USE_PERSISTENT_CCS                             1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index 32ae949bad81c93d0fd3e09507f17ae05088dfb2..7e790896a5917fef727868b4d20e5ed283cebf77 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='CC'
 set CMK_CPP_SUFFIX="cc"
 set CMK_XLATPP='charmxlat++ -w -p '
 set CMK_QT='solaris-cc'
+set CMK_XIOPTS=''
index a7f2e5139aa01f37992b1e4b4ee4dbff1e22d04a..2e9dbd0bb0ed33d816efbbf6e9187029c124bc62 100644 (file)
 #define CMK_WEB_MODE                                       1
 #define CMK_USE_PERSISTENT_CCS                             0
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/ccs/lib/cpp"
 
 #endif
index 1a187c5b4e7e6e4f2a1e31d192c3a14fcb07b520..74941506638edee3ab04195c3bcc24ae59a361de 100755 (executable)
@@ -28,3 +28,4 @@ set CMK_SEQ_LDXX='CC '
 set CMK_CPP_SUFFIX="cc"
 set CMK_XLATPP='charmxlat++ -w -p '
 set CMK_QT='solaris-cc'
+set CMK_XIOPTS=''
index 0a0e8f3b469352fd1bf57aeb5b7f2c3bf87d9c43..dd92474872e3ae3fc31dbf626829673962933659 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/ccs/lib/cpp"
 
 #endif
index b5c8829fed8268a9a58d2824729c48e56a4ea91e..9ee79107a1e6f4d8c8c1db7bcc2fe6ddcd56fab5 100755 (executable)
@@ -28,3 +28,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='solaris-gcc'
+set CMK_XIOPTS=''
index 770b86ed777d86daf5e0f8d66ac93c13bab40241..994ffecf8e7d980b9ce4501e05d5124168424bc6 100644 (file)
 #define CMK_WEB_MODE                                       1
 #define CMK_USE_PERSISTENT_CCS                             1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/ccs/lib/cpp"
 
 #endif
index 22e4fdd19c8877754b90b5bcb05b40f32a7ac013..aebdb9ad9774bf45671af791dc4f0a25fabc03b1 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='sunos-gcc'
+set CMK_XIOPTS=''
index 263c784af535b295a174f7e3166367cd560045ae..db250ae796edd153363002e80b7a649c048f18c9 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index a25bca42890b8b1012e050ef08a7b426908f9933..f41541a2c11f32f69efcd7e0164355ff88ea6238 100644 (file)
@@ -31,3 +31,4 @@ set CMK_NM_FILTER="grep '|GLOB |' | sed -e 's/.*|//'"
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ -w '
 set CMK_QT='origin'
+set CMK_XIOPTS=''
index 9bd6aeb64a9112812593883fbfcaaa83e80c5285..4dc6f88bb0927b9ae5deda11deb20c92bda9f9cd 100644 (file)
 #define CMK_DEBUG_MODE                                     0
 #define CMK_WEB_MODE                                       0
 #define CMK_USE_PERSISTENT_CCS                             0
+
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #endif
 
index d90d26c512c838f237b5888323b08e9fc031929c..db52601849ce96f1f16b93f5e5f0fb302f4d11cd 100755 (executable)
@@ -31,3 +31,4 @@ set CMK_NM_FILTER="grep '|GLOB |' | sed -e 's/.*|//'"
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ -w '
 set CMK_QT='origin'
+set CMK_XIOPTS=''
index d8d07ac5256b5c26b809af63047bf3af6bc369c4..955de5bf1a233c837ef8999f244f19f95dc00c03 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 9023364282e9eaab06c44de0fac1f92aff6c8605..65eec628ffd407ae64356c08415d5bb38e620a7a 100755 (executable)
@@ -31,3 +31,4 @@ set CMK_NM_FILTER="grep '|GLOB |' | sed -e 's/.*|//'"
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ -w '
 set CMK_QT='origin'
+set CMK_XIOPTS=''
index 29b4c1fe981f8c442f86edeb6bce9a4b0e46acb9..ac8c8b20202e1080e3cf49b5ab1662ee7b05bd94 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
-#define CPP_LOCATION "/usr/lib/cpp"
-
 #define NODE_0_IS_CONVHOST                                 1
 #define CMK_DEBUG_MODE                                     1
 #define CMK_WEB_MODE                                       1
 #define CMK_USE_PERSISTENT_CCS                             1
+
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
+#define CPP_LOCATION "/usr/lib/cpp"
+
 #endif
 
index 9ec20ce2b10ea272a6e472c93111b961de2bdc46..2f36a700a36ab1b2bb7ca5142874c7e54fab387f 100644 (file)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='CC -w'
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='asci-red'
+set CMK_XIOPTS=''
index b20778933016046a15b06e1eb88cc190e86ab087..b7a5346f47c8b7167d340be7c1b68cdb850c0f03 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #endif
 
index d0b7d0ffd6487c926357b30d2d2d9617d9b1a21f..82ed13736de3e173c4a0b1e1f53d8de8277feb12 100644 (file)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ -w'
 set CMK_QT='hpux-gcc'
+set CMK_XIOPTS=''
index d2fe84371d97b7e9eea6af8841f41f04f175a283..ac7de699b779bec0d0f15717d053050d826b5640 100644 (file)
 
 #define CPP_LOCATION "/lib/cpp"
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #endif
 
index b4e877c2f9d3a681223814810e4ca0ab93f2bf84..b408b65e16fefb3e6f5cc4d07cae2f34b53321b3 100755 (executable)
@@ -31,3 +31,4 @@ set CMK_NM_FILTER="grep '|GLOB |' | sed -e 's/.*|//'"
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ -w '
 set CMK_QT='origin'
+set CMK_XIOPTS=''
index 2e7210a0767dde7e15eee22bb14aa3a5114364cc..89df13ee1c737a6e851e29dcd52ff8b7b64fcdf2 100644 (file)
 
 #define CPP_LOCATION "/usr/lib/cpp"
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #endif
 
index 0e527ea12b432558b167cfb486279b023decef92..62dbc8c75c1c9cd521b00c3c3ab7b888ee32572e 100644 (file)
@@ -31,3 +31,4 @@ set CMK_NM_FILTER="grep '|Proc    |' | sed -e 's/.*| //'"
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++  '
 set CMK_QT='irix5-cc'
+set CMK_XIOPTS=''
index 3097a0e6f9a5f328178d8438effb730cc4e3405c..a763216e2c259b8cad0d41f4df0fc0e8b20f9fe6 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index ece3586ac63dc6b0ebcbfd38890d40129e694f05..c623ed6b8a0e1039a8e1d22f19e8ea16993b0335 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='i386-gcc'
+set CMK_XIOPTS=''
index 2f13d97f09b89f6175abfc85df3329aa65216eab..dee96eb3242a72075daa2514a16178db6b6952c0 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index e96e05928f28cee32e1d20d3afb6e575381ae878..12ac93d2702b99c1209b7cd52bd9a5a4aae32574 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ -w'
 set CMK_QT='aix32-gcc'
+set CMK_XIOPTS=''
index 9f15230a533b10a60b2061c0f0ef923924bb16cc..c3511f3af5e703c2326516072ef0dd3a9e329c43 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 87b5c8a32053ac5728ccee4a29bda3504afc1601..a6283871d1c252662d141bbefea292c138f7afbd 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='solaris-gcc'
+set CMK_XIOPTS=''
index e9a751bd180278ac64a04c74ed14a6c9f2bee87b..16fe1e17cb8da244038a20183c652af4e9eea67f 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/ccs/lib/cpp"
 
 #endif
index 9c47cbce16f8db18bc0cd1cde632a4932825aed7..44343f06b7061ed3891c6b259a64793a4dc90ccf 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='sunos-gcc'
+set CMK_XIOPTS=''
index 6a9dd1712c571f538eb7f32d48a9b334477fa6f6..a542017fb2fdf31cb25976dafe51bea61790ef55 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 87c7c0a149ca23a422952a69af711fbe0416bea1..2cdddfcbcf1a8e187278413d4c8793ac25a25e3a 100644 (file)
@@ -31,3 +31,4 @@ set CMK_NM_FILTER    = "grep ^_CK_ | cut -f 1 -d ' '"
 set CMK_CPP_SUFFIX   = "i"
 set CMK_XLATPP       = 'charmxlat++ '
 set CMK_QT='aix32-gcc'
+set CMK_XIOPTS=''
index cb295990980bd6f4d6236423228d59ae44da42a6..f55a5661a3a812f8bff06bdf26d1f9eb33f007a6 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index a78d3bdaaad0e9f86b100a8780fcc4acb9cd15e1..e6576cc4f29fe1a41724c7c9ea7bf89d1cc5bbc2 100644 (file)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='CC'
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ -w '
 set CMK_QT='cray-t3e-cc'
+set CMK_XIOPTS=''
index 4d371cfe95972f6cc501d460a20a5e0ec4db1abc..b3590a5cbb99c46f4eb59c9f436089ece16a1abb 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                1
 #define CMK_DONT_USE_HP_MAIN_FIX                           0
 
-#define CPP_LOCATION "cpp"
-
 #define NODE_0_IS_CONVHOST                                 1
 #define CMK_DEBUG_MODE                                     1
 #define CMK_WEB_MODE                                       1
 #define CMK_USE_PERSISTENT_CCS                             1
+
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
+#define CPP_LOCATION "cpp"
+
 #endif
 
index 92c0e2c108e521e30c2d2c3d6ec24b5f236670d5..16619d8781213fbb3f963f02a3323de8344324a3 100644 (file)
@@ -26,3 +26,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ -w '
 set CMK_QT='axp-gcc'
+set CMK_XIOPTS=''
index 756d9547b79faf63de4e623f8acbd6c69c0d1853..8fe5b740f38a174a101b447cc1ce68baa5c41188 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 67c32a778ccd93d3c175bd11aa6c6b4f7f35b5d2..85cfbc79ea5214683b06e49f74dd8063d6ef4777 100644 (file)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='CC -D_HPUX_SOURCE '
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='hpux-cc'
+set CMK_XIOPTS=''
index b457c53bf88db1e2453c4d69de39c62e0ba3bd01..f1b2871b4a8db8a02618250dafedaf9bdeaa916b 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                               1
 #define CMK_DONT_USE_HP_MAIN_FIX                          0
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index f7e07de0ba3ea9370fcad6379f01d9d92dba4ee5..471f6c6beb9ba4d568e8db0213aebf6a8b1a236c 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ -w'
 set CMK_QT='hpux-gcc'
+set CMK_XIOPTS=''
index 9629e43d510b2bfe3a412c39e0291ab3989015a6..71508c981fa96acc99294a851cd98347d982af60 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index b4e877c2f9d3a681223814810e4ca0ab93f2bf84..b408b65e16fefb3e6f5cc4d07cae2f34b53321b3 100755 (executable)
@@ -31,3 +31,4 @@ set CMK_NM_FILTER="grep '|GLOB |' | sed -e 's/.*|//'"
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ -w '
 set CMK_QT='origin'
+set CMK_XIOPTS=''
index 54f482b1d8c3909ef0a87e36ee8efa1f88815729..7b2e1c5b48c09a5a364571107405a2b76e77720c 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index fdf45a2a75d81826fa165e98a09275e2f3ee728e..534f54111c5289731b4e9da1a595f46970d54f1e 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='CC -32 -w '
 set CMK_CPP_SUFFIX="i"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='irix5-cc'
+set CMK_XIOPTS=''
index 78d25d394b7265c99a8493aa88e789c208401b7e..081f6a719d0c9af97b85c9c2b94c7eb75934ced7 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 0171b768970ab1e153d2a09dafc5e105b40837cb..bdaf3a445b91edddb25cddcdc66053fd0bb300ee 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='generic'
+set CMK_XIOPTS=''
index 2c497176a775788d0908f3e7379990341656c3b2..e865eafbfdab0e8a37a39867683124b000be8334 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/lib/cpp"
 
 #endif
index e96e05928f28cee32e1d20d3afb6e575381ae878..12ac93d2702b99c1209b7cd52bd9a5a4aae32574 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ -w'
 set CMK_QT='aix32-gcc'
+set CMK_XIOPTS=''
index a472b176098d1c353ade0af47560c0facc5e00b0..bf472f0f735ef31b009b2b5074b4ba45b93d78e1 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/lib/cpp"
 
 #endif
index 4020fd58de44097154dd93c56f1116341c2d14c9..20db986771c24b72816960e1a5fe5468f424b52a 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='CC'
 set CMK_CPP_SUFFIX="cc"
 set CMK_XLATPP='charmxlat++ -w '
 set CMK_QT='solaris-cc'
+set CMK_XIOPTS=''
index 99b8525d4f5e4a6e26226301df33a49b2a023334..12ec49b19a14aa57f73e04382224e6c7423f952e 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/ccs/lib/cpp"
 
 #endif
index 5d0ecaa21d0ba0a669bad2866202da4c1e40eda6..70360a24929aae3c9167d6027d9036e0db197f00 100755 (executable)
@@ -27,3 +27,4 @@ set CMK_SEQ_LDXX='g++'
 set CMK_CPP_SUFFIX="ii"
 set CMK_XLATPP='charmxlat++ '
 set CMK_QT='solaris-gcc'
+set CMK_XIOPTS=''
index eb34fc537d0b117fc3962ba164cf461e76d9d0b9..8e0a049f5de8a33b74fbf7b00f353fd310d575c6 100644 (file)
 #define CMK_USE_HP_MAIN_FIX                                0
 #define CMK_DONT_USE_HP_MAIN_FIX                           1
 
+#define CMK_COMPILEMODE_ORIG                               1
+#define CMK_COMPILEMODE_ANSI                               0
+
 #define CPP_LOCATION "/usr/ccs/lib/cpp"
 
 #endif
index a1dd95198b74712c37901f358a3d1c44a8c98f7d..f12bdae88e53b1828930ff4cdbb3be4520c216ef 100644 (file)
@@ -17,7 +17,10 @@ class Chare {
   protected:
     CkChareID thishandle;
   public:
-    void *operator new(size_t, void *ptr) { return ptr; }
+    void *operator new(size_t, void *ptr) { return ptr; };
+#if CMK_COMPILEMODE_ANSI
+    void operator delete(void*, void*) {};
+#endif
     void *operator new(size_t s) { return malloc(s); }
     void operator delete(void *ptr) { free(ptr); }
 #if CMK_DEBUG_MODE
index f7ae4c3b9279f2b22350630c9d1c052d69b321ac..2e250880a687ba9283ba81a90e356eda7d13f679 100755 (executable)
@@ -471,7 +471,7 @@ foreach FILE ($FILES)
   endif
   switch ($FILE)
     case "*.ci"
-      ($ECHOCMD ; $CHARMBIN/charmxi $BASE.ci)
+      ($ECHOCMD ; $CHARMBIN/charmxi $CMK_XIOPTS $BASE.ci)
       if ($status) goto failure
       breaksw
     case "*.idl"
index 5382e6d3b9392a9bbe4aa74bdd0de46da4e7b744..a864e200646eef026a1887c4cc9a22a2fe1854e8 100644 (file)
@@ -24,13 +24,42 @@ ModuleList *Parse(char *interfacefile)
   return modlist;
 }
 
+void abortxi(char *name)
+{
+  cout << "Usage : " << name << " [-ansi]  module.ci" << endl;
+  exit(1) ;
+}
+
 main(int argc, char *argv[])
 {
-  if ( argc != 2 ) {
-    cout << "Usage : " << argv[0] << " module.ci" << endl;
-    exit(1) ;
+  char *fname;
+  char *option=0;
+
+  compilemode = original;
+
+  switch (argc) {
+  case 2:
+    fname = argv[1];
+    break;
+
+  case 3:
+    if (*argv[1]=='-') {
+      option = argv[1];
+      fname = argv[2];
+    } else if (*(argv[2]) == '-') {
+      fname = argv[1];
+      option = argv[2];
+    } else abortxi(argv[0]);
+
+    break;
+  default:
+    abortxi(argv[0]);
   }
-  ModuleList *m = Parse(argv[1]) ;
+  
+  if (option != 0 && strcmp(option,"-ansi")==0)
+    compilemode = ansi;
+
+  ModuleList *m = Parse(fname) ;
   m->generate();
   return 0 ;
 }
index 377a5708b1954706e20f36e84a1c7da297aa80c7..3a43f3bc8adff70898c91a26e26f3c8b1dad532d 100644 (file)
@@ -4,6 +4,8 @@
 #include <stdlib.h>
 #include "xi-symbol.h"
 
+CompileMode compilemode;
+
 void 
 ConstructList::setExtern(int e) 
 {
@@ -172,9 +174,10 @@ Module::print(XStr& str)
 }
 
 void
-Module::generate(void)
+Module::generate()
 {
   XStr declstr, defstr;
+  
   declstr<<"#ifndef _DECL_" << name << "_H_"<<endx;
   declstr<<"#define _DECL_" << name << "_H_"<<endx;
   declstr<<"#include \"charm++.h\""<<endx;
@@ -216,7 +219,7 @@ ModuleList::print(XStr& str)
 }
 
 void 
-ModuleList::generate(void) 
+ModuleList::generate()
 {
   module->generate();
   if(next)
@@ -525,10 +528,28 @@ static const char *CIMsgClass =
 "    void*operator new(size_t s, int p){return CkAllocMsg(__idx,s,p);}\n"
 ;
 
+static const char *CIMsgClassAnsi =
+"{\n"
+"  public:\n"
+"    static int __idx;\n"
+"    static void __register(const char *s);\n"
+"    void*operator new(size_t s){return CkAllocMsg(__idx,s,0);}\n"
+"    void operator delete(void *p){CkFreeMsg(p);}\n"
+"    void*operator new(size_t,void*p){return p;}\n"
+"    void operator delete(void*,void*){}\n"
+"    void*operator new(size_t s, int p){return CkAllocMsg(__idx,s,p);}\n"
+"    void operator delete(void *,int){}\n"
+;
+
 static const char *CIAllocDecl =
 "    void *operator new(size_t s, int *sz, int p);\n"
 ;
 
+static const char *CIAllocDeclAnsi =
+"    void *operator new(size_t s, int *sz, int p);\n"
+"    void operator delete(void*,int *,int);\n"
+;
+
 void
 Message::genDecls(XStr& str)
 {
@@ -546,9 +567,14 @@ Message::genDecls(XStr& str)
     str <<";";
     return;
   }
-  str.spew(CIMsgClass);
+  if (compilemode==ansi)
+    str.spew(CIMsgClassAnsi);
+  else str.spew(CIMsgClass);
+
   if(isVarsize()) {
-    str.spew(CIAllocDecl);
+    if (compilemode==ansi)
+      str.spew(CIAllocDeclAnsi);
+    else str.spew(CIAllocDecl);
   }
   str << "};\n";
 }
index 2f3267c429ac6165ba34df6529a8ed3fafb07e15..c94daa31b31db02b40df1a7562f40fa7c177ea06 100644 (file)
@@ -8,6 +8,9 @@
 
 #include "xi-util.h"
 
+typedef enum { original, ansi } CompileMode;
+extern CompileMode compilemode;
+
 class Value : public Printable {
   private:
     char *val;
@@ -429,7 +432,7 @@ class Module : public Construct {
   public:
     Module(char *n, ConstructList *c) : name(n), clist(c) { _isMain=0; }
     void print(XStr& str);
-    void generate(void);
+    void generate();
     void genDecls(XStr& str);
     void genDefs(XStr& str);
     void genReg(XStr& str);
@@ -443,7 +446,7 @@ class ModuleList : public Printable {
   public:
     ModuleList(Module *m, ModuleList *n=0) : module(m), next(n) {}
     void print(XStr& str);
-    void generate(void);
+    void generate();
 };
 
 class Readonly : public Construct, public Member {