diff --git a/base/src/TApplication.cxx b/base/src/TApplication.cxx
index 77b57578e37bef40c3b752c0ec054e840d2b1f97..f70da344c132b64e9261cda700d04abdff04bc58 100644
--- a/base/src/TApplication.cxx
+++ b/base/src/TApplication.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TApplication.cxx,v 1.35 2002/09/19 13:54:08 rdm Exp $
+// @(#)root/base:$Name: $:$Id: TApplication.cxx,v 1.37 2002/10/18 17:14:21 brun Exp $
// Author: Fons Rademakers 22/12/95
/*************************************************************************
@@ -603,8 +603,8 @@ void TApplication::ProcessLine(const char *line, Bool_t sync, int *err)
int len = strlen(fn);
char *mode = 0;
if (len>1) {
- if (strcmp(fn+len-1,"d")==0) mode = "d";
- else if (strcmp(fn+len-1,"o")==0) mode = "o";
+ if (strcmp(fn+len-1,"g")==0) mode = "g";
+ else if (strcmp(fn+len-1,"O")==0) mode = "O";
if (mode) len--;
}
Bool_t compile = !strncmp(fn+len-1,"+",1);
diff --git a/base/src/TSystem.cxx b/base/src/TSystem.cxx
index 230d92ca887a60f8956012ad611cbc93b5342536..0f089f829e2c4ab5db16b018b2f9357b9790d8f9 100644
--- a/base/src/TSystem.cxx
+++ b/base/src/TSystem.cxx
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TSystem.cxx,v 1.39 2002/10/17 06:54:10 brun Exp $
+// @(#)root/base:$Name: $:$Id: TSystem.cxx,v 1.40 2002/10/18 14:58:55 brun Exp $
// Author: Fons Rademakers 15/09/95
/*************************************************************************
@@ -1234,8 +1234,8 @@ int TSystem::CompileMacro(const char *filename, Option_t * opt,
// The possible options are:
// k : keep the shared library after the session end.
// f : force recompilation.
- // d : compile with debug symbol
- // o : optimized the code (ignore if 'd' is specified)
+ // g : compile with debug symbol
+ // O : optimized the code (ignore if 'd' is specified)
//
// If library_specified is specified, CompileMacro generates the file
// "library_specified".soext where soext is the shared library extension for
@@ -1334,10 +1334,10 @@ int TSystem::CompileMacro(const char *filename, Option_t * opt,
if (opt) {
keep = (strchr(opt,'k')!=0);
recompile = (strchr(opt,'f')!=0);
- if (strchr(opt,'o')!=0) {
+ if (strchr(opt,'O')!=0) {
mode = kOpt;
}
- if (strchr(opt,'d')!=0) {
+ if (strchr(opt,'g')!=0) {
mode = kDebug;
}
}
diff --git a/cint/src/loadfile.c b/cint/src/loadfile.c
index da38e3e4507a7ba24d49860258b327dd87ddc078..927384358a0ca4609728215d0da7e2ff9b75b010 100644
--- a/cint/src/loadfile.c
+++ b/cint/src/loadfile.c
@@ -1,4 +1,4 @@
-/* /% C %/ */
+//* /% C %/ */
/***********************************************************************
* cint (C/C++ interpreter)
************************************************************************
@@ -1011,14 +1011,14 @@ char *filenamein;
* ++, like script.cxx++ or script.C++
* ending with only one + means to keep the shared
* library after the end of this process.
- * The + or ++ can also be followed by either a 'd'
- * or an 'o' which means respectively to compile
+ * The + or ++ can also be followed by either a 'g'
+ * or an 'O' which means respectively to compile
* in debug or optimized mode.
*************************************************/
compiler_option = 0;
if ( len>2 && (strncmp(filename+len-2,"+",1)==0 )
- && (strcmp(filename+len-1,"o")==0
- || strcmp(filename+len-1,"d")==0 )
+ && (strcmp(filename+len-1,"O")==0
+ || strcmp(filename+len-1,"g")==0 )
) {
compiler_option = filename+len-1;
len -= 1;
@@ -1028,8 +1028,8 @@ char *filenamein;
#ifndef G__OLDIMPLEMENTATION1303
if (compiler_option) {
switch(compiler_option[0]) {
- case 'o': compiler_option = "kfo"; break;
- case 'd': compiler_option = "kfd"; break;
+ case 'O': compiler_option = "kfO"; break;
+ case 'g': compiler_option = "kfg"; break;
default: G__genericerror("Should not have been reached!");
}
} else {
@@ -1040,8 +1040,8 @@ char *filenamein;
} else {
if (compiler_option) {
switch(compiler_option[0]) {
- case 'o': compiler_option = "ko"; break;
- case 'd': compiler_option = "kd"; break;
+ case 'O': compiler_option = "kO"; break;
+ case 'g': compiler_option = "kg"; break;
default: G__genericerror("Should not have been reached!");
}
} else {
diff --git a/cint/src/v6_loadfile.cxx b/cint/src/v6_loadfile.cxx
index da38e3e4507a7ba24d49860258b327dd87ddc078..927384358a0ca4609728215d0da7e2ff9b75b010 100644
--- a/cint/src/v6_loadfile.cxx
+++ b/cint/src/v6_loadfile.cxx
@@ -1,4 +1,4 @@
-/* /% C %/ */
+//* /% C %/ */
/***********************************************************************
* cint (C/C++ interpreter)
************************************************************************
@@ -1011,14 +1011,14 @@ char *filenamein;
* ++, like script.cxx++ or script.C++
* ending with only one + means to keep the shared
* library after the end of this process.
- * The + or ++ can also be followed by either a 'd'
- * or an 'o' which means respectively to compile
+ * The + or ++ can also be followed by either a 'g'
+ * or an 'O' which means respectively to compile
* in debug or optimized mode.
*************************************************/
compiler_option = 0;
if ( len>2 && (strncmp(filename+len-2,"+",1)==0 )
- && (strcmp(filename+len-1,"o")==0
- || strcmp(filename+len-1,"d")==0 )
+ && (strcmp(filename+len-1,"O")==0
+ || strcmp(filename+len-1,"g")==0 )
) {
compiler_option = filename+len-1;
len -= 1;
@@ -1028,8 +1028,8 @@ char *filenamein;
#ifndef G__OLDIMPLEMENTATION1303
if (compiler_option) {
switch(compiler_option[0]) {
- case 'o': compiler_option = "kfo"; break;
- case 'd': compiler_option = "kfd"; break;
+ case 'O': compiler_option = "kfO"; break;
+ case 'g': compiler_option = "kfg"; break;
default: G__genericerror("Should not have been reached!");
}
} else {
@@ -1040,8 +1040,8 @@ char *filenamein;
} else {
if (compiler_option) {
switch(compiler_option[0]) {
- case 'o': compiler_option = "ko"; break;
- case 'd': compiler_option = "kd"; break;
+ case 'O': compiler_option = "kO"; break;
+ case 'g': compiler_option = "kg"; break;
default: G__genericerror("Should not have been reached!");
}
} else {