get it to compile with clang

2 files changed, 20 insertions, 40 deletions

diff --git a/command_line/CmdLine/Src/Callbacks/CLCompilerLinkerDropin_V10.cpp b/command_line/CmdLine/Src/Callbacks/CLCompilerLinkerDropin_V10.cpp
index 070bc07..3804b93 100644
--- a/command_line/CmdLine/Src/Callbacks/CLCompilerLinkerDropin_V10.cpp
+++ b/command_line/CmdLine/Src/Callbacks/CLCompilerLinkerDropin_V10.cpp
@@ -52,10 +52,8 @@ CWResult UCBStoreObjectData(CWPluginContext context, SInt32 whichfile, CWObjectD
         UCBSecretAttachHandle(context, objecthand, &object->objectdata);
         UCBSecretAttachHandle(context, browsehand, &object->browsedata);
     } else {
-        if (filedata->outfileowner && filedata->outfileowner != CmdLineStageMask_Cg) {
-#line 240
-            DO_INTERNAL_ERROR("Cannot store object file spec for '%s'\n", filedata->srcfilename);
-        }
+        if (filedata->outfileowner && filedata->outfileowner != CmdLineStageMask_Cg)
+            DO_INTERNAL_ERROR(240, "Cannot store object file spec for '%s'\n", filedata->srcfilename);
         OS_FSSpec_To_OSSpec(object->objectfile, &filedata->outfss);
         filedata->wroteToDisk |= CmdLineStageMask_Cg;
     }
@@ -134,8 +132,7 @@ CWResult UCBBeginSubCompile(CWPluginContext context, SInt32 whichfile, CWPluginC
     if (optsCmdLine.verbose > 3)
         CLPrint("Callback: %s\n", "UCBBeginSubCompile");
 
-#line 372
-    DO_INTERNAL_ERROR("UCBBeginSubCompile not implemented");
+    DO_INTERNAL_ERROR(372, "UCBBeginSubCompile not implemented");
     return cwErrRequestFailed;
 }
 
@@ -143,8 +140,7 @@ CWResult UCBEndSubCompile(CWPluginContext subContext) {
     if (optsCmdLine.verbose > 3)
         CLPrint("Callback: %s\n", "UCBEndSubCompile");
 
-#line 384
-    DO_INTERNAL_ERROR("UCBEndSubCompile not implemented");
+    DO_INTERNAL_ERROR(384, "UCBEndSubCompile not implemented");
     return cwErrRequestFailed;
 }
 
@@ -165,8 +161,7 @@ CWResult UCBGetPrecompiledHeaderSpec(CWPluginContext context, CWFileSpec *pchspe
         return cwErrInvalidCallback;
 
     file = Files_GetFile(&gTarg->files, c->whichfile);
-#line 420
-    OPTION_ASSERT(file != NULL);
+    OS_ASSERT(420, file != NULL);
 
     cof = Plugin_CL_GetObjectFlags(file->compiler);
     if (!file->outfilename[0]) {
@@ -222,8 +217,7 @@ CWResult UCBGetResourceFile(CWPluginContext context, CWFileSpec *filespec) {
     if (optsCmdLine.verbose > 3)
         CLPrint("Callback: %s\n", "UCBGetResourceFile");
 
-#line 514
-    DO_INTERNAL_ERROR("UCBGetResourceFile not implemented");
+    DO_INTERNAL_ERROR(514, "UCBGetResourceFile not implemented");
     return cwErrRequestFailed;
 }
 
@@ -231,8 +225,7 @@ CWResult UCBPutResourceFile(CWPluginContext context, const char *prompt, const c
     if (optsCmdLine.verbose > 3)
         CLPrint("Callback: %s\n", "UCBPutResourceFile");
 
-#line 529
-    DO_INTERNAL_ERROR("UCBPutResourceFile not implemented");
+    DO_INTERNAL_ERROR(529, "UCBPutResourceFile not implemented");
     return cwErrRequestFailed;
 }
 
@@ -270,8 +263,7 @@ CWResult UCBLookUpUnit(CWPluginContext context, const char *name, Boolean isdepe
         return cwErrInvalidCallback;
 
     srcfile = Files_GetFile(&gTarg->files, c->whichfile);
-#line 591
-    OPTION_ASSERT(srcfile != NULL);
+    OS_ASSERT(591, srcfile != NULL);
 
     *unitdata = NULL;
     *unitdatalength = 0;
@@ -403,8 +395,7 @@ CWResult UCBStoreUnit(CWPluginContext context, const char *inunitname, CWMemHand
             return cwErrInvalidCallback;
 
         srcfile = Files_GetFile(&gTarg->files, c->whichfile);
-#line 791
-        OPTION_ASSERT(srcfile != NULL);
+        OS_ASSERT(791, srcfile != NULL);
 
         if (optsCompiler.sbmPath[0]) {
             err = OS_MakeSpecWithPath(&clState.sbmPathSpec, unitname, 1, &sbmspec);
@@ -510,8 +501,7 @@ CWResult UCBGetModifiedFiles(CWPluginContext context, SInt32 *modifiedFileCount,
         CLPrint("Callback: %s\n", "UCBGetModifiedFiles");
 
     *modifiedFileCount = 0;
-#line 949
-    DO_INTERNAL_ERROR("CWGetModifiedFiles not implemented!\n");
+    DO_INTERNAL_ERROR(949, "CWGetModifiedFiles not implemented!\n");
     return cwNoErr;
 }
 
@@ -538,8 +528,7 @@ CWResult UCBGetStoredObjectFileSpec(CWPluginContext context, SInt32 whichfile, C
     if (!(file = Files_GetFile(&gTarg->files, whichfile)))
         return cwErrUnknownFile;
     if (file->outfileowner != CmdLineStageMask_Cg) {
-#line 993
-        DO_INTERNAL_ERROR("Lost stored object file spec for '%s'\n", file->srcfilename);
+        DO_INTERNAL_ERROR(993, "Lost stored object file spec for '%s'\n", file->srcfilename);
         return cwErrRequestFailed;
     } else {
         OS_OSSpec_To_FSSpec(&file->outfss, fileSpec);
diff --git a/command_line/CmdLine/Src/Callbacks/CLDropinCallbacks_V10.cpp b/command_line/CmdLine/Src/Callbacks/CLDropinCallbacks_V10.cpp
index ed02965..24eaf83 100644
--- a/command_line/CmdLine/Src/Callbacks/CLDropinCallbacks_V10.cpp
+++ b/command_line/CmdLine/Src/Callbacks/CLDropinCallbacks_V10.cpp
@@ -203,8 +203,7 @@ static Boolean FindAndLoad_MissingFile(CWPluginContext context, const char *file
             return 0;
 
         file = Files_GetFile(&gTarg->files, c->whichfile);
-#line 486
-        OPTION_ASSERT(file != NULL);
+        OS_ASSERT(486, file != NULL);
 
         OS_MakeSpecWithPath(&file->srcfss.path, filename, 1, spec);
         Deps_AddDependency(&file->deps, -1, spec, !fileinfo->fullsearch && !optsCompiler.noSysPath, fileinfo->dependencyType, &fileinfo->alreadyincluded);
@@ -638,8 +637,7 @@ CWResult UCBStorePluginData(CWPluginContext context, SInt32 whichfile, CWDataTyp
     if (optsCmdLine.verbose > 3)
         CLPrint("Callback: %s\n", "UCBStorePluginData");
 
-#line 1267
-    DO_INTERNAL_ERROR("UCBStorePluginData not implemented");
+    DO_INTERNAL_ERROR(1267, "UCBStorePluginData not implemented");
     return cwErrRequestFailed;
 }
 
@@ -647,8 +645,7 @@ CWResult UCBGetPluginData(CWPluginContext context, SInt32 whichfile, CWDataType
     if (optsCmdLine.verbose > 3)
         CLPrint("Callback: %s\n", "UCBGetPluginData");
 
-#line 1286
-    DO_INTERNAL_ERROR("UCBGetPluginData not implemented");
+    DO_INTERNAL_ERROR(1286, "UCBGetPluginData not implemented");
     return cwErrRequestFailed;
 }
 
@@ -951,8 +948,7 @@ CWResult UCBCreateNewTextDocument(CWPluginContext context, const CWNewTextDocume
                 return cwErrRequestFailed;
         }
     } else {
-#line 1755
-        DO_INTERNAL_ERROR("Cannot deal with unexpected document");
+        DO_INTERNAL_ERROR(1755, "Cannot deal with unexpected document");
         return cwErrInvalidCallback;
     }
 }
@@ -1062,8 +1058,7 @@ CWResult UCBPreFileAction(CWPluginContext context, const CWFileSpec *theFile) {
     if (optsCmdLine.verbose > 3)
         CLPrint("Callback: %s\n", "UCBPreFileAction");
 
-#line 1963
-    DO_INTERNAL_ERROR("UCBPreFileAction not implemented");
+    DO_INTERNAL_ERROR(1963, "UCBPreFileAction not implemented");
     return cwErrRequestFailed;
 }
 
@@ -1071,8 +1066,7 @@ CWResult UCBPostFileAction(CWPluginContext context, const CWFileSpec *theFile) {
     if (optsCmdLine.verbose > 3)
         CLPrint("Callback: %s\n", "UCBPostFileAction");
 
-#line 1977
-    DO_INTERNAL_ERROR("UCBPostFileAction not implemented");
+    DO_INTERNAL_ERROR(1977, "UCBPostFileAction not implemented");
     return cwErrRequestFailed;
 }
 
@@ -1100,8 +1094,7 @@ CWResult UCBCacheAccessPathList(CWPluginContext context) {
         for (x = 0; x < apl->userPathCount; x++) {
             ap = &apl->userPaths[x];
             path = Paths_GetPath(&gTarg->userPaths, x);
-#line 2010
-            OPTION_ASSERT(path);
+            OS_ASSERT(2010, path);
 
             OS_MakeSpecWithPath(path->spec, NULL, 0, &spec);
             OS_OSSpec_To_FSSpec(&spec, &ap->pathSpec);
@@ -1132,8 +1125,7 @@ CWResult UCBCacheAccessPathList(CWPluginContext context) {
         for (x = 0; x < apl->systemPathCount; x++) {
             ap = &apl->systemPaths[x];
             path = Paths_GetPath(&gTarg->sysPaths, x);
-#line 2044
-            OPTION_ASSERT(path);
+            OS_ASSERT(2044, path);
 
             OS_MakeSpecWithPath(path->spec, NULL, 0, &spec);
             OS_OSSpec_To_FSSpec(&spec, &ap->pathSpec);
@@ -1208,8 +1200,7 @@ CWResult UCBCheckinLicense(CWPluginContext context, SInt32 cookie) {
 }
 
 CWResult UCBResolveRelativePath(CWPluginContext context, const CWRelativePath *relativePath, CWFileSpec *fileSpec, Boolean create) {
-#line 2255
-    DO_INTERNAL_ERROR("UCBResolveRelativePath not implemented");
+    DO_INTERNAL_ERROR(2255, "UCBResolveRelativePath not implemented");
     return cwErrRequestFailed;
 }