Build fixes for *NIX.

diff --git a/base/asynctask.h b/base/asynctask.h
index 7569cfab8ed04d9b09676708857297697274bc16..4d42a49ebe95dee3ba033df21032796d198f9ff6 100644 (file)
--- a/base/asynctask.h
+++ b/base/asynctask.h
@@ -61,7 +61,7 @@ public:
        typedef shared_ptr<AsyncTask<TClass, TResult> > Ptr;
        typedef weak_ptr<AsyncTask<TClass, TResult> > WeakPtr;
 
-       typedef function<void (const typename shared_ptr<TClass>&)> CompletionCallback;
+       typedef function<void (const shared_ptr<TClass>&)> CompletionCallback;
 
        /**
         * Constructor for the AsyncTask class.

diff --git a/base/process.cpp b/base/process.cpp
index 7e92b1cc2fd17af95b647e8b6c4aaf2f34d24262..4232647d4e01cabba652665a6c13898487b062c7 100644 (file)
--- a/base/process.cpp
+++ b/base/process.cpp
@@ -31,7 +31,7 @@ deque<Process::Ptr> Process::m_Tasks;
 condition_variable Process::m_TasksCV;
 
 Process::Process(const string& command, const CompletionCallback& completionCallback)
-       : AsyncTask(completionCallback), m_Command(command), m_UsePopen(false)
+       : AsyncTask<Process, ProcessResult>(completionCallback), m_Command(command), m_UsePopen(false)
 {
        if (!m_ThreadCreated) {
                thread t(&Process::WorkerThreadProc);

diff --git a/base/scripttask.cpp b/base/scripttask.cpp
index 9956d4e4e1a82ea4869b5ca85f3d9c9710beb34d..1066729f71ff671fabdf7e62bfcdafb4b691b66d 100644 (file)
--- a/base/scripttask.cpp
+++ b/base/scripttask.cpp
@@ -3,7 +3,7 @@
 using namespace icinga;
 
 ScriptTask::ScriptTask(const ScriptFunction::Ptr& function, const vector<Variant>& arguments, CompletionCallback callback)
-       : AsyncTask(callback), m_Function(function), m_Arguments(arguments)
+       : AsyncTask<ScriptTask, Variant>(callback), m_Function(function), m_Arguments(arguments)
 { }
 
 void ScriptTask::Run(void)

diff --git a/dyn/config_lexer.cc b/dyn/config_lexer.cc
index ea13ff2d41f019fcb5f600845c82c311f959ee79..66a30675013c33fa34221c8c65e0b33f8a2e09ef 100644 (file)
--- a/dyn/config_lexer.cc
+++ b/dyn/config_lexer.cc
@@ -53,6 +53,7 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -83,8 +84,6 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -158,15 +157,7 @@ typedef void* yyscan_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -546,7 +537,7 @@ do {                                                        \
 } while (0)
 #define YY_NO_UNISTD_H 1
 
-#line 550 "config_lexer.cc"
+#line 541 "config_lexer.cc"
 
 #define INITIAL 0
 #define IN_C_COMMENT 1
@@ -684,12 +675,7 @@ static int input (yyscan_t yyscanner );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -708,7 +694,7 @@ static int input (yyscan_t yyscanner );
        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                { \
                int c = '*'; \
-               size_t n; \
+               unsigned n; \
                for ( n = 0; n < max_size && \
                             (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
                        buf[n] = (char) c; \
@@ -795,7 +781,7 @@ YY_DECL
 
 #line 49 "config_lexer.ll"
 
-#line 799 "config_lexer.cc"
+#line 785 "config_lexer.cc"
 
     yylval = yylval_param;
 
@@ -1007,7 +993,7 @@ YY_RULE_SETUP
 #line 79 "config_lexer.ll"
 ECHO;
        YY_BREAK
-#line 1011 "config_lexer.cc"
+#line 997 "config_lexer.cc"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(IN_C_COMMENT):
        yyterminate();
@@ -1788,8 +1774,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  */