From 6f6c10491ce0e973fe8328508fe2a232c2189016 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 4 Oct 2009 14:18:38 +0200
Subject: Move runtime inline function to inline file

---
 cli/generator.cxx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'cli/generator.cxx')

diff --git a/cli/generator.cxx b/cli/generator.cxx
index 844981a..801f7e5 100644
--- a/cli/generator.cxx
+++ b/cli/generator.cxx
@@ -14,10 +14,11 @@
 #include <cutl/compiler/cxx-indenter.hxx>
 
 #include "header.hxx"
-#include "source.hxx"
 #include "inline.hxx"
+#include "source.hxx"
 
 #include "runtime-header.hxx"
+#include "runtime-inline.hxx"
 #include "runtime-source.hxx"
 
 #include "context.hxx"
@@ -180,9 +181,8 @@ generate (options const& ops, semantics::cli_unit& unit, path const& p)
           << "#define " << guard << endl
           << endl;
 
-      generate_runtime_header_decl (ctx);
+      generate_runtime_header (ctx);
       generate_header (ctx);
-      generate_runtime_header_impl (ctx);
 
       if (inl)
       {
@@ -200,6 +200,7 @@ generate (options const& ops, semantics::cli_unit& unit, path const& p)
     {
       cxx_filter filt (ixx);
       context ctx (ixx, unit, ops);
+      generate_runtime_inline (ctx);
       generate_inline (ctx);
     }
 
@@ -214,9 +215,13 @@ generate (options const& ops, semantics::cli_unit& unit, path const& p)
           << endl;
 
       if (!inl)
-        generate_inline (ctx);
+        generate_runtime_inline (ctx);
 
       generate_runtime_source (ctx);
+
+      if (!inl)
+        generate_inline (ctx);
+
       generate_source (ctx);
     }
 
-- 
cgit v1.1