Browse Source

Code tidy to remove compile errors.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@875 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 17 years ago
parent
commit
06c917a55f
  1. 6
      prism/include/PrismHybridGlob.h
  2. 8
      prism/include/PrismSparseGlob.h
  3. 6
      prism/src/hybrid/PrismHybrid.cc
  4. 8
      prism/src/sparse/PrismSparse.cc

6
prism/include/PrismHybridGlob.h

@ -84,9 +84,9 @@ extern double last_unif;
// macros, function prototypes
#define logtwo(X) log((double)X)/log(2.0)
void PH_PrintToMainLog(JNIEnv *env, char *str, ...);
void PH_PrintToTechLog(JNIEnv *env, char *str, ...);
void PH_SetErrorMessage(char *str, ...);
void PH_PrintToMainLog(JNIEnv *env, const char *str, ...);
void PH_PrintToTechLog(JNIEnv *env, const char *str, ...);
void PH_SetErrorMessage(const char *str, ...);
char *PH_GetErrorMessage();
//------------------------------------------------------------------------------

8
prism/include/PrismSparseGlob.h

@ -82,11 +82,11 @@ extern JNIEnv *export_env;
// macros, function prototypes
#define logtwo(X) log((double)X)/log(2.0)
void PS_PrintToMainLog(JNIEnv *env, char *str, ...);
void PS_PrintToTechLog(JNIEnv *env, char *str, ...);
void PS_SetErrorMessage(char *str, ...);
void PS_PrintToMainLog(JNIEnv *env, const char *str, ...);
void PS_PrintToTechLog(JNIEnv *env, const char *str, ...);
void PS_SetErrorMessage(const char *str, ...);
char *PS_GetErrorMessage();
int store_export_info(int type, jstring fn, JNIEnv *env);
void export_string(char *str, ...);
void export_string(const char *str, ...);
//------------------------------------------------------------------------------

6
prism/src/hybrid/PrismHybrid.cc

@ -132,7 +132,7 @@ JNIEXPORT void JNICALL Java_hybrid_PrismHybrid_PH_1SetTechLog(JNIEnv *env, jclas
//------------------------------------------------------------------------------
void PH_PrintToMainLog(JNIEnv *env, char *str, ...)
void PH_PrintToMainLog(JNIEnv *env, const char *str, ...)
{
va_list argptr;
char full_string[MAX_LOG_STRING_LEN];
@ -149,7 +149,7 @@ void PH_PrintToMainLog(JNIEnv *env, char *str, ...)
//------------------------------------------------------------------------------
void PH_PrintToTechLog(JNIEnv *env, char *str, ...)
void PH_PrintToTechLog(JNIEnv *env, const char *str, ...)
{
va_list argptr;
char full_string[MAX_LOG_STRING_LEN];
@ -255,7 +255,7 @@ JNIEXPORT void JNICALL Java_hybrid_PrismHybrid_PH_1SetDoSSDetect(JNIEnv *env, jc
// error message handling
//------------------------------------------------------------------------------
void PH_SetErrorMessage(char *str, ...)
void PH_SetErrorMessage(const char *str, ...)
{
va_list argptr;

8
prism/src/sparse/PrismSparse.cc

@ -125,7 +125,7 @@ JNIEXPORT void JNICALL Java_sparse_PrismSparse_PS_1SetTechLog(JNIEnv *env, jclas
//------------------------------------------------------------------------------
void PS_PrintToMainLog(JNIEnv *env, char *str, ...)
void PS_PrintToMainLog(JNIEnv *env, const char *str, ...)
{
va_list argptr;
char full_string[MAX_LOG_STRING_LEN];
@ -142,7 +142,7 @@ void PS_PrintToMainLog(JNIEnv *env, char *str, ...)
//------------------------------------------------------------------------------
void PS_PrintToTechLog(JNIEnv *env, char *str, ...)
void PS_PrintToTechLog(JNIEnv *env, const char *str, ...)
{
va_list argptr;
char full_string[MAX_LOG_STRING_LEN];
@ -232,7 +232,7 @@ int store_export_info(int type, jstring fn, JNIEnv *env)
// export string (either to file or main log)
void export_string(char *str, ...)
void export_string(const char *str, ...)
{
va_list argptr;
char full_string[MAX_LOG_STRING_LEN];
@ -261,7 +261,7 @@ JNIEXPORT void JNICALL Java_sparse_PrismSparse_PS_1SetDoSSDetect(JNIEnv *env, jc
// error message handling
//------------------------------------------------------------------------------
void PS_SetErrorMessage(char *str, ...)
void PS_SetErrorMessage(const char *str, ...)
{
va_list argptr;

Loading…
Cancel
Save