get it to compile with clang

1 files changed, 9 insertions, 18 deletions

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;
 }