Changeset 19003

Show
Ignore:
Timestamp:
07/09/06 18:48:17 (2 years ago)
Author:
allenb
Message:

Fix NSPR build on platforms that use the make/configure based build.

The ErrorImplNSPR.cpp file was missing from the build which led to a missing symbol in vapor.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • juggler/trunk/modules/vapor/vpr/md/NSPR/Util/ErrorImplNSPR.cpp

    r18824 r19003  
    4040 
    4141#include <vpr/md/NSPR/Util/ErrorImplNSPR.h> 
     42#include <boost/concept_check.hpp> 
    4243 
    4344 
     
    6465      { 
    6566         msg_stream << ": " << err_name; 
    66       }  
     67      } 
    6768 
    6869      if ( err_str != NULL ) 
     
    7576} 
    7677 
     78void ErrorImplNSPR::outputCurrentError(std::ostream& out, const std::string& prefix) 
     79{ 
     80   out << "Error (NSPR): " << prefix << " (" << getCurrentErrorMsg() << ")" 
     81       << std::endl; 
    7782} 
     83 
     84 
     85} 
  • juggler/trunk/modules/vapor/vpr/md/NSPR/Util/ErrorImplNSPR.h

    r18824 r19003  
    5656   static std::string getCurrentErrorMsg(); 
    5757 
    58    static void outputCurrentError(std::ostream& out, const std::string& prefix) 
    59    { 
    60       out << "Error (NSPR): " << prefix << " (" << getCurrentErrorMsg() << ")" 
    61           << std::endl; 
    62    } 
     58   /** Output the current error message to a stream. */ 
     59   static void outputCurrentError(std::ostream& out, const std::string& prefix); 
    6360 
    6461   static ErrorType getCurrentError() 
    6562   { 
     63      // TODO: Implement error conversion to get the current error. 
    6664      return NoError; 
    6765   } 
    6866 
    6967protected: 
     68   /* 
    7069   static PRErrorCode convertErrorVprToNspr(ErrorType mask) 
    7170   { 
     
    7776      return NoError; 
    7877   } 
     78   */ 
    7979}; 
    8080 
  • juggler/trunk/modules/vapor/vpr/md/NSPR/Util/Makefile.in

    r18824 r19003  
    5252 
    5353ifeq (@SUBSYSTEM@, NSPR) 
    54 #   SRCS=        
     54   SRCS=        ErrorImplNSPR.cpp 
    5555endif 
    5656