fix a variety of warnings/errors

1 files changed, 4 insertions, 1 deletions

diff --git a/src/mesa/shader/slang/Include/Common.h b/src/mesa/shader/slang/Include/Common.h
index bd1aaa8fcf..4a9c0d34a7 100755
--- a/src/mesa/shader/slang/Include/Common.h
+++ b/src/mesa/shader/slang/Include/Common.h
@@ -230,7 +230,10 @@ public:
     typedef pool_allocator<std::pair <K, D> > tAllocator;

 

     TMap() : TBaseMap<K, D, CMP, tAllocator >() {}

+/*

     TMap(const tAllocator& a) : TBaseMap<K, D, CMP, tAllocator >(key_compare(), a) {}

+*/

+    TMap(const tAllocator& a) : TBaseMap<K, D, CMP, tAllocator >() {}

 };

 

 //

@@ -275,7 +278,7 @@ __inline TPersistString FormatSourceLoc(const TSourceLoc loc)
     if (line)

         sprintf(locText, "%d:%d", string, line);

     else

-        sprintf(locText, "%d:? ", string, line);

+        sprintf(locText, "%d:? ", string);

 

     return TPersistString(locText);

 }