Another one bites the dust.

[wxWidgets.git] / src / common / wxexpr.cpp

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 4868df9b6e7863f41fe6f5e626dff3356accc242..e7cabf24f0bff4f150df23ef2aa1c0d368960b78 100644 (file)
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -21,12 +21,9 @@
 #endif
 
 #if wxUSE_IOSTREAMH
 #endif
 
 #if wxUSE_IOSTREAMH

-#include <fstream.h>
+    #include <fstream.h>

 #else
 #else

-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+    #include <fstream>

 #endif
 
 #include <stdarg.h>
 #endif
 
 #include <stdarg.h>


@@ -42,6 +39,7 @@ extern "C" void add_expr(char *);
 extern "C" void LexFromFile(FILE *fd);
 extern "C" void LexFromString(char *buf);
 
 extern "C" void LexFromFile(FILE *fd);
 extern "C" void LexFromString(char *buf);
 

+

 wxExprDatabase *thewxExprDatabase = NULL;
 wxExprErrorHandler currentwxExprErrorHandler;
 
 wxExprDatabase *thewxExprDatabase = NULL;
 wxExprErrorHandler currentwxExprErrorHandler;
 


@@ -1137,14 +1135,14 @@ bool wxExprIsFunctor(wxExpr *expr, const wxString& functor)
  *
  */
 
  *
  */
 

-char *make_integer(char *str)
+char *wxmake_integer(char *str)

 {
   wxExpr *x = new wxExpr(atol(str));
 
   return (char *)x;
 }
 
 {
   wxExpr *x = new wxExpr(atol(str));
 
   return (char *)x;
 }
 

-char *make_real(char *str1, char *str2)
+char *wxmake_real(char *str1, char *str2)

 {
   char buf[50];
 
 {
   char buf[50];
 


@@ -1157,7 +1155,7 @@ char *make_real(char *str1, char *str2)
 
 // extern "C" double exp10(double);
 
 
 // extern "C" double exp10(double);
 

-char *make_exp(char *str1, char *str2)
+char *wxmake_exp(char *str1, char *str2)

 {
   double mantissa = (double)atoi(str1);
   double exponent = (double)atoi(str2);
 {
   double mantissa = (double)atoi(str1);
   double exponent = (double)atoi(str2);


@@ -1169,7 +1167,7 @@ char *make_exp(char *str1, char *str2)
   return (char *)x;
 }
 
   return (char *)x;
 }
 

-char *make_exp2(char *str1, char *str2, char *str3)
+char *wxmake_exp2(char *str1, char *str2, char *str3)

 {
   char buf[50];
 
 {
   char buf[50];
 


@@ -1184,13 +1182,13 @@ char *make_exp2(char *str1, char *str2, char *str3)
   return (char *)x;
 }
 
   return (char *)x;
 }
 

-char *make_word(char *str)
+char *wxmake_word(char *str)

 {
   wxExpr *x = new wxExpr(wxExprWord, str);
   return (char *)x;
 }
 
 {
   wxExpr *x = new wxExpr(wxExprWord, str);
   return (char *)x;
 }
 

-char *make_string(char *str)
+char *wxmake_string(char *str)

 {
   char *s, *t;
   int len, i;
 {
   char *s, *t;
   int len, i;