Modify for updated CodeDweller.

git-svn-id: https://svn.microneil.com/svn/SNFMulti/branches/adeniz_1@61 dc71a809-1921-45c4-985c-09c81d0142d9

scanner.cpp

@@ -32,7 +32,11 @@
 // locate compound rules or parameter scans used to pick up tuning data from the
 // rulebase.
 
-#include "scanner.hpp"
+#include "SNFMulti/scanner.hpp"
+
+using namespace std;
+
+namespace SNFMulti {
 
 // Scanner::LoadRuleBase(RuleFileName, SecurityKey)
 
@@ -110,3 +114,5 @@ EvaluationMatrix* Scanner::ScanText(unsigned char* TextBuffer) { // Scan without
    return myEvaluationMatrix;                      // Return our results.
 
 }
+
+}

scanner.hpp

@@ -28,8 +28,12 @@
 #ifndef _MN_Scanner
 #define _MN_Scanner
 
-#include "FilterChain.hpp"
-#include "snf_engine.hpp"
+#include "SNFMulti/FilterChain.hpp"
+#include "SNFMulti/snf_engine.hpp"
+
+#include <string>
+
+namespace SNFMulti {
 
 const int ScanHorizon = 32768;      // Maximum length of message to check.
 
@@ -56,7 +60,8 @@ class Scanner {
       }
     }
 
-    void LoadRuleBase(string& RuleFileName, string& SecurityKey);  // Load & Validate RuleBase.
+    void LoadRuleBase(std::string& RuleFileName,
+                      std::string& SecurityKey);               // Load & Validate RuleBase.
 
     EvaluationMatrix* ScanMessage(unsigned char* MessageBuffer);   // Scan with filter chain.
 
@@ -66,4 +71,6 @@ class Scanner {
     
 };
 
+}
+
 #endif