port back to Linux

diff --git a/src/Pegasus/Common/OptionManager.cpp b/src/Pegasus/Common/OptionManager.cpp
index fc5567985723f08f4c36b380f3e56636fbc33b53..f6bb226abc022e3924fd33556e3ce30fc6f9a30d 100644 (file)
--- a/src/Pegasus/Common/OptionManager.cpp
+++ b/src/Pegasus/Common/OptionManager.cpp
@@ -23,6 +23,9 @@
 // Author: Michael E. Brasher
 //
 // $Log: OptionManager.cpp,v $
+// Revision 1.10  2001/04/24 21:15:48  mike
+// port back to Linux
+//
 // Revision 1.9  2001/04/24 00:00:14  mike
 // Ported compiler to use String and Array (rather than STL equivalents)
 //
@@ -54,7 +57,9 @@
 //END_HISTORY
 
 #include <cstdlib>
+#include <cctype>
 #include <fstream>
+#include <cstdio>
 #include "OptionManager.h"
 #include "Destroyer.h"
 
@@ -533,6 +538,9 @@ Boolean Option::isValid(const String& value) const
 
                case WHOLE_NUMBER:
                    return x >= 0;
+
+               default:
+                   break;
            }
        }
     }

diff --git a/src/Pegasus/Common/ServiceUnix.cpp b/src/Pegasus/Common/ServiceUnix.cpp
index 6c012e4e5ee7a8315bfdb96857498b96f4c38c38..d70fb2523c3a27a0e71d599b0646ea1f17237253 100644 (file)
--- a/src/Pegasus/Common/ServiceUnix.cpp
+++ b/src/Pegasus/Common/ServiceUnix.cpp
@@ -1,5 +1,7 @@
 #include "Service.h"
 
+PEGASUS_NAMESPACE_BEGIN
+
 bool Service::run(
     int argc,
     char** argv,
@@ -15,3 +17,5 @@ bool Service::run(
 
     return false;
 }
+
+PEGASUS_NAMESPACE_END

diff --git a/src/Pegasus/Compiler/cmdline/cmdline.cpp b/src/Pegasus/Compiler/cmdline/cmdline.cpp
index 0e5f7eb09b26487f24abedb9bcc7b5de945346b6..3dad3110ae5b75fc75d9f9e07b0bd169be869b2e 100755 (executable)
--- a/src/Pegasus/Compiler/cmdline/cmdline.cpp
+++ b/src/Pegasus/Compiler/cmdline/cmdline.cpp
@@ -31,6 +31,7 @@
 //
 
 #include <fstream>
+#include <cstdlib>
 #include <iostream>
 #include <Pegasus/Common/String.h>
 

diff --git a/src/Pegasus/Compiler/load/Makefile b/src/Pegasus/Compiler/load/Makefile
index 651707ea9a93fc77678e43f4b088478c64687eb1..e5082b6d5c180b169035061609bc2145673fb074 100644 (file)
--- a/src/Pegasus/Compiler/load/Makefile
+++ b/src/Pegasus/Compiler/load/Makefile
@@ -5,10 +5,12 @@ MOF_PATH = $(ROOT)/Schemas/CIM25
 
 
 all:
-       $(RMDIRHIER) $(REPOSITORY_ROOT)/repository
-       cimmof -I$(MOF_PATH) -nroot $(MOF_PATH)/CIM_Core25.mof
-       cimmof -I$(MOF_PATH) $(MOF_PATH)/CIM_Schema25.mof
 
-clean:
 tests:
+       @ echo "+++++ Populating CIM repository (this will take a minute)"
+       @ $(RMDIRHIER) $(REPOSITORY_ROOT)/repository
+       @ cimmof -I$(MOF_PATH) -nroot $(MOF_PATH)/CIM_Core25.mof
+       @ cimmof -I$(MOF_PATH) $(MOF_PATH)/CIM_Schema25.mof
+
+clean:
 depend:

diff --git a/src/Pegasus/Makefile b/src/Pegasus/Makefile
index 0f9d765ce726e49a2d9d55c1b7307006113dbec8..8814a647695b307c5288a0495719a2330475fcd3 100644 (file)
--- a/src/Pegasus/Makefile
+++ b/src/Pegasus/Makefile
@@ -4,6 +4,7 @@ include $(ROOT)/mak/config.mak
 
 TEST_DIRS = \
 
+
 DIRS = \
     Common \
     Repository \
@@ -13,8 +14,8 @@ DIRS = \
     Server \
     getoopt \
     Compiler \
-    Compiler/cmdline \
     Compiler/load \
+    Compiler/cmdline \
     Common/tests \
     Repository/tests \
     Server/tests \

diff --git a/src/Pegasus/getoopt/getoopt.cpp b/src/Pegasus/getoopt/getoopt.cpp
index bbe9be24637dda22995a27b8ae9137985e791fda..d45617c601f3ecdea4b50bd1449e068a7785f725 100755 (executable)
--- a/src/Pegasus/getoopt/getoopt.cpp
+++ b/src/Pegasus/getoopt/getoopt.cpp
@@ -30,7 +30,8 @@
 // implementation of getoopt
 
 #include "getoopt.h"
-#include <String.h>
+#include <cctype>
+#include <cstdlib>
 
 using namespace std;
 

diff --git a/src/Pegasus/getoopt/getoopt.h b/src/Pegasus/getoopt/getoopt.h
index fc1ca95768225d573f9855d196e20de31a28ee0d..2459bcaf12f4fccce4e44049c08e879cb0acfbf1 100755 (executable)
--- a/src/Pegasus/getoopt/getoopt.h
+++ b/src/Pegasus/getoopt/getoopt.h
@@ -23,6 +23,9 @@
 // Author: Bob Blair
 //
 // $Log: getoopt.h,v $
+// Revision 1.5  2001/04/24 21:15:49  mike
+// port back to Linux
+//
 // Revision 1.4  2001/04/24 00:00:15  mike
 // Ported compiler to use String and Array (rather than STL equivalents)
 //
@@ -53,7 +56,6 @@
 #ifndef _GETOOPT_H_
 #define _GETOOPT_H_
 
-#include <String>
 #include <iostream>
 #include <Pegasus/Common/Array.h>
 #include <Pegasus/Common/String.h>

diff --git a/src/Server/cimserver.cpp b/src/Server/cimserver.cpp
index c69af071b48089f71792e5e4ce30de47cac91e5b..5323f214b9f1d63cad9b08adb12fd774d83abc64 100644 (file)
--- a/src/Server/cimserver.cpp
+++ b/src/Server/cimserver.cpp
@@ -25,6 +25,7 @@
 //END_HISTORY
 
 #include <iostream>
+#include <cstdlib>
 #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/Selector.h>
 #include <Pegasus/Common/OptionManager.h>
@@ -125,7 +126,7 @@ int main(int argc, char** argv)
     {
        cerr << argv[0] << ": unrecognized options: ";
 
-       for (Uint32 i = 1; i < argc; i++)
+       for (int i = 1; i < argc; i++)
            cerr << argv[i] << ' ';
        cout << endl;
        exit(1);