--- trunk/src/applications/openmd/openmd.cpp	2010/06/28 20:07:12	1458
+++ trunk/src/applications/openmd/openmd.cpp	2010/11/24 17:40:12	1526
@@ -59,8 +59,6 @@ using namespace OpenMD;
 
 using namespace OpenMD;
 
-char* __get_svn_version();
-
 int main(int argc,char* argv[]){
   
   // first things first, all of the initializations
@@ -71,7 +69,19 @@ int main(int argc,char* argv[]){
    
   initSimError();           // the error handler
   srand48( 1337 );          // the random number generator.
-  
+
+  std::string svnrev;
+  //convert a macro from compiler to a string in c++
+  STR_DEFINE(svnrev, SVN_REV );
+
+  std::string revision;
+
+  if (!svnrev.empty()) {
+     revision.assign("  Revision: " + svnrev);
+  }
+
+  revision.resize(19,' ');
+
 #ifdef IS_MPI
   if( worldRank == 0 ){
 #endif
@@ -84,8 +94,8 @@ int main(int argc,char* argv[]){
       "  | \\____/ .___/\\___/_/ /_//_/  /_//_____/    Copyright 2004-2010 by the  |\n"<<
       "  |     /_/                                   University of Notre Dame.   |\n"<<
       "  |                                                                       |\n"<<
-      "  |            version " << 
-      OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << "  Revision:" << __get_svn_version() << 
+      "  |        version " << 
+      OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << revision << 
       "     http://www.openmd.net       |\n"<<
       "  |                                                                       |\n"<<
       "  | OpenMD is an OpenScience project.  All source code is available for   |\n"<<
@@ -147,7 +157,7 @@ int main(int argc,char* argv[]){
     Integrator* myIntegrator = IntegratorFactory::getInstance()->createIntegrator(toUpperCopy(simParams->getEnsemble()), info);
  
     if (myIntegrator == NULL) {
-      sprintf(painCave.errMsg, "Integrator Factory can not create %s Integrator\n",
+      sprintf(painCave.errMsg, "Integrator Factory cannot create %s Integrator\n",
 	      simParams->getEnsemble().c_str());
       painCave.isFatal = 1;
       simError();
@@ -194,14 +204,3 @@ int main(int argc,char* argv[]){
 
   return 0 ;
 }
-
-  char svnVersionString[1024];
-  char* __get_svn_version(){
-    int howMuchToCopy=0;
-    const char *theVersion="$Revision$";
-    howMuchToCopy=strlen(theVersion+11) - 2;
-    assert(howMuchToCopy>0);
-    memcpy(svnVersionString,  theVersion+11, howMuchToCopy);
-    svnVersionString[howMuchToCopy] = '\0';
-    return svnVersionString;
-  }